Fixed missing file
Merge remote-tracking branch 'origin/master'

Conflicts:
	MansionMashers/MansionMashers/Debug/MansionMashers.lastbuildstate