Merge iie's code into my code #1

Merged

NorbiPeti merged 4 commits from iie into master

2016-11-05 20:57:36 +00:00

Author	SHA1	Message	Date
NorbiPeti	c1a7aa8732	Made progress on merge conflict	2016-11-05 21:47:21 +01:00
NorbiPeti	ae11acc4bf	Renamed things here as well to fix conflicts	2016-11-05 20:51:18 +01:00
NorbiPeti	ef7d2bf12f	Renamed things here as well to fix conflicts	2016-11-05 20:51:02 +01:00
BuildTools	6ceb5e1210	next have to do playerdata serializing not sure if there’s stuff i was in the middle of changing, there might be weird shit anomalies or there	2016-11-05 15:00:29 -04:00