started working on save state
merged
Merge branch 'master' of github.com:storbeck/1GAM

Conflicts:
	12-2014 Snow Day/12-2014 Snow Day-csharp.sln
	12-2014 Snow Day/12-2014 Snow Day-csharp.v12.suo
	12-2014 Snow Day/12-2014 Snow Day.sln
	12-2014 Snow Day/12-2014 Snow Day.userprefs
	12-2014 Snow Day/Assembly-CSharp-vs.csproj
	12-2014 Snow Day/Assets/Scenes/Levels/Level_1.unity
	12-2014 Snow Day/Assets/Scripts/GameControl.cs
	12-2014 Snow Day/Assets/Scripts/GameControl.cs.meta
	12-2014 Snow Day/Assets/Scripts/Player/CharacterInput.cs
	12-2014 Snow Day/Library/CurrentLayout.dwlt
	12-2014 Snow Day/Library/CurrentMaximizeLayout.dwlt
	12-2014 Snow Day/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	12-2014 Snow Day/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	12-2014 Snow Day/Library/ScriptAssemblies/Assembly-CSharp.dll
	12-2014 Snow Day/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	12-2014 Snow Day/Library/assetDatabase3
	12-2014 Snow Day/Library/expandedItems
	12-2014 Snow Day/Library/guidmapper
	12-2014 Snow Day/Library/metadata/8d/8df34c848f817eb44a38f31048635a47