Added UI to the game
Bug where health bars variably move vertically
Fix is somewhere with vertical scrolling limiting
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.filters
	GoliathGame/GoliathGame/Player.cpp
	GoliathGame/GoliathGame/Player.h