changes
Merge branch 'master' of https://github.com/CSCI150-TeamF/150project into John

Conflicts:
	SDLTemplate/Debug/SDLTemplate.log
	SDLTemplate/PlayState.cpp
	SDLTemplate/Player.cpp
Merge branch 'master' of https://github.com/CSCI150-TeamF/150project into John
State Switching debugged. event checking needed
merge