particle beam works

Switch weapons by pressing 'C'
Merge remote-tracking branch 'origin/master'

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