commit
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Scenes/startScene.unity
Merge branch 'master' of https://github.com/keisec/YADC

Conflicts:
	Assets/Scenes/startScene.unity