kind of useless changes that would be fixed easier if i just pulled :D
Merge branch 'master' of https://github.com/Johnnyappseed/Physics_Game

Conflicts:
	bin/flash/bin/PhysicsGame.swf
	src/Main.hx