World map custom inspector
World inspector
Merge branch 'master' of https://github.com/smyrick/eecs499-5pm

Conflicts:
	UnityProject/Assets/Scenes/Main.unity
	UnityProject/UnityProject.userprefs