2014-11-25
マップチップ貼った
Merge branch 'master' of https://github.com/tak0294/unity-wizardry

Conflicts:
	Assets/Resources.meta
	Assets/Resources/Prefabs.meta