oka
Merge branch 'master' of https://github.com/imtylerim/cs-final

Conflicts:
	GameComp