20141113_o
Merge branch 'master' of https://github.com/neolara777/kishitest

Conflicts:
	Kishidan/Assets/Sprites/image_back.png.meta
	Kishidan/Assets/main.unity
20141114_o