Marker fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/expandedItems
	Project3/Library/metadata/6d/6dd003571c4fc744084d98bbb5140b45
	Project3/Library/metadata/b4/b4f3771578b1cc042a892835af05c176
	Project3/Project3-csharp.sln
	Project3/Project3.sln
	Project3/Project3.userprefs
Merge branch 'master' of https://github.com/snofz/EECS494Final

Conflicts:
	Project3/Library/CurrentLayout.dwlt
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project3/Library/assetDatabase3
	Project3/Library/metadata/9a/9ac6d7c285fdeaa498681afbceae7bc1
	Project3/Project3.userprefs