Switching to new collision method, bottom point finished
Merge branch 'collision'

Conflicts:
	src/ata/Entity.as
Merge branch 'master' of github.com:TerranceN/GGJ2014

Conflicts:
	src/ata/GameLogic.as