some main changes
Merge branch 'master' of https://github.com/crumblingstatue/ProjectHazard

Conflicts:
	main.cpp