COLLISIONS WORK YAY
Merge branch 'master' of https://github.com/cullensu/Capstone

Conflicts:
	game_src/src/project/state/GameState.as