ba-
Merge branch 'master' of http://github.com/iwatowake/UCGJ2014

Conflicts:
	UCGJ/Assets/Scene/Main2Player.unity
	UCGJ/Assets/Scene/Main3Player.unity
	UCGJ/Assets/Scene/Main4Player.unity
	UCGJ/Assets/Script/UnityChanControll.cs