X
Merge branch 'master' of https://github.com/AlanOctavius/DaveCon2K14

Conflicts:
	.gitignore
	DaveCon/DaveCon_Data/output_log.txt
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll
	DaveCon/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	DaveCon/Library/assetDatabase3
	DaveCon/Library/metadata/c7/c72a62d8861a8a8489284089d314a3f5