need to pull
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Need to pull.
Merge branch 'master' of https://github.com/jkwendorf/ICS_169-Goliath

Conflicts:
	GoliathGame/Debug/GoliathGame.exe
	GoliathGame/Debug/GoliathGame.pdb
	GoliathGame/GoliathGame.sdf
	GoliathGame/GoliathGame.v11.suo
Fixed 2 grapple bugs.  First fixed the left-right bug where the grapple would switch between left and right location when switching too quickly.
Second fixed the bug where the grapple would stay in a certain location like it was frozen in time.