test
Merge branch 'master' of https://github.com/shohe/MOLDBOY

Conflicts:
	MOLDBOYGAME/Library/CurrentLayout.dwlt
	MOLDBOYGAME/Library/assetDatabase3
Merge branch 'master' of https://github.com/shohe/MOLDBOY

Conflicts:
	MOLDBOYGAME/Assets/Game.unity
	MOLDBOYGAME/Assets/moldboy_run/MOLDBOYRUN.anim
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run01.png.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run02.controller
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run02.controller.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run02.png.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run03.png.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run04.png.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run05.png.meta
	MOLDBOYGAME/Assets/moldboy_run/moldboy_run06.png.meta
	MOLDBOYGAME/Assets/moldboy_run02.prefab
	MOLDBOYGAME/Assets/moldboy_run02.prefab.meta
	MOLDBOYGAME/Library/CurrentLayout.dwlt
	MOLDBOYGAME/Library/assetDatabase3
	MOLDBOYGAME/Library/guidmapper
	MOLDBOYGAME/Library/metadata/29/29a6d42cd708f6e42add51c406dc9e2a
	MOLDBOYGAME/Library/metadata/3f/3f8a95629ac73e4498880369b37219eb
	MOLDBOYGAME/Library/metadata/56/56cc6bfb42449a845a675ab879e9fec3
	MOLDBOYGAME/Library/metadata/8c/8c8878d4c52476b4eb3ad28d9f26e0ab
	MOLDBOYGAME/Library/metadata/9f/9fb0ba84019de4d4984438038f285953
	MOLDBOYGAME/Library/metadata/a4/a437a2949e27c8e4790227e8d568d9aa
	MOLDBOYGAME/Library/metadata/d3/d3e119631c34df84d9c65853c751b6ac
	MOLDBOYGAME/Library/metadata/f4/f431d6ddfc62a7b4b9c4bb68e6898c8b