no message
Merge branch 'master' of https://github.com/ChubbyLover/GamefulLiving

Conflicts:
	devbuild0.1/Assets/Scenes/Level_Alpha.unity
	devbuild0.1/Assets/Scripts/Objects/Camera/Camera_Follow.cs
	devbuild0.1/Library/CurrentLayout.dwlt
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll
	devbuild0.1/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	devbuild0.1/Library/assetDatabase3
	devbuild0.1/Library/expandedItems
	devbuild0.1/Library/guidmapper
	devbuild0.1/Library/metadata/19/194f17536afae1b47b67bdb4d5a84806
	devbuild0.1/devbuild0.1.userprefs