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

Conflicts:
	TeamBravoProject/Assets/Gun_Animation_Blank_Design.mb.meta
	TeamBravoProject/Assets/Gun_Animation_Blank_Design.mb.meta~HEAD.meta
	TeamBravoProject/Assets/Gun_Animation_Blank_Design.mb.meta~HEAD_0.meta
	TeamBravoProject/Assets/Gun_Animation_Blank_Design.mb.meta~New Level, first few puzzles, boxes.meta
	TeamBravoProject/Assets/Gun_Animation_Blank_Design.mb.meta~c1a7c36fc785bceb88d8530a629a5a24f4c8da81.meta
	TeamBravoProject/Assets/Scripts/ScentReaveAI.js
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/CurrentMaximizeLayout.dwlt
	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/08/08737ec9735d2e94ca75770362fe1a39
	TeamBravoProject/Library/metadata/11/113d8f67db4aa79409dddc94f56d858c
	TeamBravoProject/Library/metadata/88/88eba2c656f7f4040bf13b696f6ecb20
	TeamBravoProject/Library/metadata/a4/a4bbeaeca270f46499174dbf231bcd7d
	TeamBravoProject/Library/metadata/da/da7cf2a4d0403034b8234044c6730cc1
	TeamBravoProject/Library/metadata/e0/e0f97a8342dcfa34685ec73423ff5156
	TeamBravoProject/TeamBravoProject.userprefs