Nick0.1
st
st
ll
g

g
12
13
13
13
Nick0.11
9.19.1
Merge remote-tracking branch 'origin/master' into Nick

Conflicts:
	Prototype/Assembly-CSharp-Editor.pidb
	Prototype/Assembly-CSharp-firstpass.pidb
	Prototype/Assembly-CSharp.pidb
	Prototype/Assembly-UnityScript-firstpass.pidb
	Prototype/Assets/NickPrototype0.1.unity
	Prototype/Library/InspectorExpandedItems.asset
	Prototype/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Prototype/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Prototype/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Prototype/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll
	Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Prototype/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Prototype/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Prototype/Library/assetDatabase3
	Prototype/Library/expandedItems
	Prototype/Library/guidmapper
	Prototype/Prototype.userprefs
Gitignore Updated
111
Merge branch 'master' of https://github.com/HawkDaght/Thesis_Prototype into Nick

Conflicts:
	.DS_Store
9.19.1530
asdas
Merge branch 'Nick'