Moving the screen up and down while stationary is implemented
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
	GoliathGame/GoliathGame/GoliathGame.vcxproj
	GoliathGame/GoliathGame/GoliathGame.vcxproj.filters
Merge branch part II