Fixed merge.
Merge branch 'master' of https://github.com/demansn/Yin-Yan

Conflicts:
	Assets/Scenes/L.1.1.unity
	Assets/Scenes/Main.unity