My change
Merge branch 'master' of https://github.com/zeroliu/pushittest

Conflicts:
	Assets/Scenes/MainGame.unity