sample change2
Merge branch 'YoshinoriDev'

Conflicts:
	Assets/main.unity
	Library/assetDatabase3
back commit
Merge branch 'master' of https://github.com/tani2016/Festival_leap

Conflicts:
	Library/assetDatabase3
Merge pull request #1 from tani2016/master

pull request