Got basic collision working
Collision handling now predicts a collision and changes the velocity to hit the floor exactly
merged master
Merge branch 'collision'

Conflicts:
	src/ata/Entity.as
	src/ata/GameLogic.as
	src/ata/Level.as
	src/ata/Player.as
	src/ata/Vector2.as