adding changes to local branch
Merge branch 'master' of github.com:jdubeau123/physicaltherapy

Conflicts:
	game_team/Game/Game.v11.suo
	game_team/Game/Game/source/manager/GameManager.cpp
Merge branch 'master' of github.com:jdubeau123/physicaltherapy
removing Game.v11.suo from working tree (unecessary visual studio file that is autogenerated locally)