Snow Stuff
Snow stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/dude.png.meta
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/06/065c02246a3268e4180d61c1a8e9aaf2
	Library/metadata/63/636764f6cc6a39040955352b7dc53983
Merge branch 'master' of https://github.com/UWGameJam2014/Holocene

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Holocene-csharp.sln
	Holocene.sln
	Holocene.userprefs
	Library/CurrentLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper