test
Merge branch 'master' of https://github.com/ecgifford92/VillageGame

Conflicts:
	VillageGame/Assets/Prefabs/Scout.prefab
	VillageGame/Library/CurrentLayout.dwlt
	VillageGame/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	VillageGame/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	VillageGame/Library/ScriptAssemblies/Assembly-CSharp.dll
	VillageGame/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	VillageGame/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	VillageGame/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	VillageGame/Library/assetDatabase3
	VillageGame/Library/guidmapper
	VillageGame/Library/metadata/04/0464696013b9c5c4d852b7965f31b177
	VillageGame/Library/metadata/2a/2a9f81f4e5e9f6c4db463eb1b2b7cd14
	VillageGame/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	VillageGame/Temp/ExportedFBXFile.fbx
	VillageGame/Temp/FBXMayaExport.mel
	VillageGame/Temp/FBXMayaExport5.mel
	VillageGame/Temp/FBXMayaMain.mel
	VillageGame/VillageGame.userprefs