ignore_deleted
ig
turrets
prototype
ignore
update
Merge branch 'Atlas'
updae
Merge branch 'master' into Nick

Conflicts:
	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.md
b
	Prototype/Library/assetDatabase3
	Prototype/Library/expandedItems
	Prototype/Library/guidmapper
	Prototype/Prototype-csharp.sln
Merge branch 'Nick' of https://github.com/HawkDaght/Thesis_Prototype into Nick

Conflicts:
	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.md
b
	Prototype/Library/assetDatabase3
	Prototype/Library/expandedItems
	Prototype/Library/guidmapper
	Prototype/Prototype-csharp.sln