Merge branch 'master' of https://github.com/shupe1109/unity-git-test

Conflicts:
	Assets/banana.cs
update 5
update6