Nothing
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Added a whole new way to check the tiles that are near the player or any rectangle we want to look at. Fixed some memory leaks
Nothing
Merge branch 'GrantTesting'
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/Debug/GoliathGame.pdb
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
	GoliathGame/GoliathGame/CollisionManager.h
	GoliathGame/GoliathGame/GameState.cpp
	GoliathGame/GoliathGame/GoliathGame.vcxproj.filters
	GoliathGame/GoliathGame/Player.cpp
Merged the branch i was working on with the master branch