Cant remeber what these changes were
Merge branch 'master' of https://github.com/Marcamillian/ThomasJS

Conflicts:
	Classes/GameObject.js