Simple stuff
Merge branch 'master' of https://github.com/MrPillBoxHat/CMSC425

Conflicts:
	Megaman CMSC451/Megaman CMSC451/World.cpp