collisions
Merge branch 'master' of https://github.com/arellanj/Current

Conflicts:
	CurrentApp.cpp
	level.h
	player.cpp