final version
Merge branch 'master' of https://github.com/gaozihan3g/PiJam

Conflicts:
	PiJam/Assets/prefabs/coin.prefab
	PiJam/Assets/prefabs/coinPattern2.prefab
	PiJam/Assets/scene/test2.unity
	PiJam/PiJam.userprefs