uncommitted
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/04/048678ac817c54740a94f01c549f199e
	TeamBravoProject/Library/metadata/11/113d8f67db4aa79409dddc94f56d858c
	TeamBravoProject/Library/metadata/21/21c70bfff1529ce4cb95b7e9f07a54c2
	TeamBravoProject/Library/metadata/26/260e8fe78ab5de8489b80180e36f7822
	TeamBravoProject/Library/metadata/3b/3b9d3f0444b5d184699a5a2e46ae7f68
	TeamBravoProject/Library/metadata/40/404d05bf239b59e4c9a4514ab15cb942
	TeamBravoProject/Library/metadata/60/6066f7d7cc58d0f47bf5c4e3508717b5
	TeamBravoProject/Library/metadata/7e/7e43471c1b718b74ca4380ad3503eef9
	TeamBravoProject/Library/metadata/87/874ea94c83ac0e846ad6d6731263d832
	TeamBravoProject/Library/metadata/89/89e0fa1f3b507cc408d708225b90d03f
	TeamBravoProject/Library/metadata/92/92a8797a16eabec44a8bed001f148ee2
	TeamBravoProject/Library/metadata/ab/abf49e15ce6329743a1612aea1d738b1
	TeamBravoProject/Library/metadata/ad/ad763168a1914b74abc1437d94561a1d
	TeamBravoProject/Library/metadata/be/be5e40eaf3f3b2d49ab74adfe5622eed
	TeamBravoProject/Library/metadata/cd/cd30ee35acf8c1841841f0881b6f2092
	TeamBravoProject/Library/metadata/ce/cec0d66668b606b42a73c5e9170ba898
	TeamBravoProject/Library/metadata/d2/d200a99f23fc5ba4698e3fd2d4dd1a2d
	TeamBravoProject/Library/metadata/d9/d9d3b7d7cc1baec428e048312ce945d0
	TeamBravoProject/Library/metadata/da/da1e8b0cebaeee145a4dae2ddceb1056
	TeamBravoProject/Library/metadata/e1/e1fa35f14cff72047b1623ab5a88f709
	TeamBravoProject/Library/metadata/e4/e4b4930a82b966141974b7078496092b
	TeamBravoProject/Library/metadata/ed/ed01fe976fcd013478f2735bf17a2bfb
	TeamBravoProject/Library/metadata/f7/f75237e0dd32aae43b0a94402c689acf
	TeamBravoProject/Library/metadata/fb/fb07f3b86dba4fe458ad789bb7cb1e10
	TeamBravoProject/Temp/ExportedFBXFile.fbx
	TeamBravoProject/Temp/FBXMayaExport5.mel
	TeamBravoProject/Temp/UnityTempFile-012de1f74bd3c544c9da69745751f534
	TeamBravoProject/Temp/UnityTempFile-09836bd0f6d4da64e957d5bd67858747
	TeamBravoProject/Temp/UnityTempFile-0a3f28e1c5b788b4e815e360782589de
	TeamBravoProject/Temp/UnityTempFile-0cde626364f15ea4e8ab0296f7d38503
	TeamBravoProject/Temp/UnityTempFile-1ddbc6c627a998b46b642f7f384e7c13
	TeamBravoProject/Temp/UnityTempFile-334f09bdd55ed0443bf0e99fe7a4cee1
	TeamBravoProject/Temp/UnityTempFile-458466d781b47514ba19f690ae27271a
	TeamBravoProject/Temp/UnityTempFile-495482dba0efcee48aa8838c4e6f493f
	TeamBravoProject/Temp/UnityTempFile-501aa77150a6e984888b8f3686d38b17
	TeamBravoProject/Temp/UnityTempFile-5dd204141510b67438a9a3d8b2ef893f
	TeamBravoProject/Temp/UnityTempFile-ba45245906abc1d4899cebab429003d6
	TeamBravoProject/Temp/UnityTempFile-cd7ba599a67dc794bbf0892beb9a2635