Tried to fix build
Merge branch 'master' of https://github.com/piaoasd123/IMGD3000PROJ2

Conflicts:
	bin_debug/dragonfly.log
	bin_debug/pdb/Debug/Project2.pdb