いろいろ
Merge branch 'master' of http://github.com/iwatowake/UCGJ2014

Conflicts:
	UCGJ/Assets/Animation/UnityChan0.controller.meta
	UCGJ/Assets/Material/ParticleMat.mat.meta
	UCGJ/Assets/Material/StageMat.mat.meta
	UCGJ/Assets/Prefabs/Particle System.prefab.meta
	UCGJ/Assets/Sprite/Run.anim.meta
	UCGJ/Assets/Sprite/unitychan.png.meta
	UCGJ/Assets/Sprite/unitychan_small.png.meta