Tile Effects
Merge branch 'master' of https://github.com/smyrick/eecs499-5pm

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