playerstuffs
Added CollisionDetection, Gravity, Jumping
Merge branch 'master' of https://github.com/joshtym/SideScrollerProject

Conflicts:
	include/Player.h
	src/GameScreen.cpp
	src/Player.cpp