Merged all branches
Merge branch 'master' of https://github.com/Thegmk13/Haunted_Light

Conflicts:
	HauntedLight/HauntedLight.vcxproj.filters