Ham will move with WASD & camera will follow it
Merge branch 'master' of https://github.com/Mayple7/SausageFox150
trying to get most recent stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	MansionMashers/Debug/MansionMashers.exe
	MansionMashers/Debug/MansionMashers.ilk
	MansionMashers/Debug/MansionMashers.pdb
	MansionMashers/MansionMashers.sdf
	MansionMashers/MansionMashers.v11.suo
	MansionMashers/MansionMashers/Debug/CL.read.1.tlog
	MansionMashers/MansionMashers/Debug/CL.write.1.tlog
	MansionMashers/MansionMashers/Debug/Main.obj
	MansionMashers/MansionMashers/Debug/MainMenu.obj
	MansionMashers/MansionMashers/Debug/MansionMashers.log
	MansionMashers/MansionMashers/Debug/cl.command.1.tlog
	MansionMashers/MansionMashers/Debug/link.command.1.tlog
	MansionMashers/MansionMashers/Debug/link.read.1.tlog
	MansionMashers/MansionMashers/Debug/link.write.1.tlog
	MansionMashers/MansionMashers/Debug/vc110.idb
	MansionMashers/MansionMashers/Debug/vc110.pdb
	MansionMashers/MansionMashers/MansionMashers.vcxproj