it no longer crashes and the weapons work again
Merge branch 'master' of https://github.com/jhaslowh/CS426

Conflicts:
	src/CS426_Project.vcxproj
	src/CS426_Project.vcxproj.filters
	src/Level.cpp
	src/Level.h