Some Changes
Merge branch 'master' of https://github.com/ggetz/girlGame

Conflicts:
	Assets/Scripts/ChangeGirlSizeWord.cs
	Assets/Scripts/Girl.cs
	Assets/Scripts/MainGame.cs
	Assets/Scripts/Particle.cs.meta
	Assets/Scripts/ParticleEngine.cs.meta
	Assets/Scripts/PictureObstacle.cs
	ProjectSettings/EditorBuildSettings.asset