Small additions

I can barely remember what I added. Rocket is mostly implemented.
Merge remote-tracking branch 'origin/master'

Conflicts:
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1.v12.suo

	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/layout.resfiles

	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/layout.resfiles.intermediate
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/vc120.idb