Visual Studio stuff
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
level1room1section1 changes:
-Removed the grapple from inside a platform, which caused crashes when grappled to.