Commit
Merge branch 'master' of https://github.com/jwaitzel/gamejam14-2sidescroll

Conflicts:
	UnityProject/Assembly-CSharp-vs.csproj
	UnityProject/Assembly-CSharp.csproj
	UnityProject/Assets/GameScene.unity
	UnityProject/Library/CurrentLayout.dwlt
	UnityProject/Library/CurrentMaximizeLayout.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/Library/metadata/4c/4c1554ab39ef840418975f00cdc4db85
	UnityProject/Library/metadata/88/889d239d0f1d84bcb99d47b8d9cfd79b
	UnityProject/UnityProject-csharp.sln
	UnityProject/UnityProject.sln
	UnityProject/UnityProject.userprefs