Laser mostly implemented

Particles are generated properly, weird error occurs in the initialize
graphics function. Concurrency issue?
Merge remote-tracking branch 'origin/master'

Conflicts:
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1.v12.suo
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/CL.read.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/CL.write.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/DirectXGame1.read.1u.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/DirectXGame1.write.1u.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/MeshContentTask-VsGraphics.120.read.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/MeshContentTask-VsGraphics.120.write.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/cl.command.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/fxc.read.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/fxc.write.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/link.command.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/link.read.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/DirectXGame1.tlog/link.write.1.tlog
	COMP3501-Final-Project-master/DirectXGame1/DirectXGame1/Debug/vc120.idb
Merge branch 'master' of https://github.com/teamcomp3501/gameproject