Input and Minor Collision Detection
Merge branch 'master' of https://github.com/anthgithub/Down-with-DIEgo

Conflicts:
	ICS4U1 Platformer/Down with DIEGO/Down with DIEGO/Player.h