Score
Merge branch 'master' of https://github.com/Nyyman/Global-Game-Jame-2014

Conflicts:
	UnityProject/Assets/_scenes/00_sandbox.unity
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/InspectorExpandedItems.asset
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	UnityProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	UnityProject/Library/assetDatabase3
	UnityProject/Library/guidmapper
	UnityProject/UnityProject-csharp.suo
Merge branch 'master' of https://github.com/Nyyman/Global-Game-Jame-2014