changed reticle, made a shader for the health bar

aligned some text, rocket now shoots properly, but syncing might destroy
that functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1.v12.suo
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/vc120.idb
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Player.cpp
Merge branch 'master' of https://github.com/teamcomp3501/gameproject

Conflicts:
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/vc120.idb