Mesa Del Sol Uncommitted changes
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/AssetServerCacheV3
	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/expandedItems
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/04/048678ac817c54740a94f01c549f199e
	TeamBravoProject/Library/metadata/08/08737ec9735d2e94ca75770362fe1a39
	TeamBravoProject/Library/metadata/11/113d8f67db4aa79409dddc94f56d858c
	TeamBravoProject/Library/metadata/18/18e4cdd3eebee5348a184d12ac8fc08d
	TeamBravoProject/Library/metadata/19/19ab21e41f6bb084bb2c1f9f8397f6df
	TeamBravoProject/Library/metadata/21/210efaa236f07a147bd6cc5524adea65
	TeamBravoProject/Library/metadata/21/21c70bfff1529ce4cb95b7e9f07a54c2
	TeamBravoProject/Library/metadata/26/260e8fe78ab5de8489b80180e36f7822
	TeamBravoProject/Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	TeamBravoProject/Library/metadata/56/560e031e651e19347be0137d68496742
	TeamBravoProject/Library/metadata/60/6066f7d7cc58d0f47bf5c4e3508717b5
	TeamBravoProject/Library/metadata/6c/6cc78cc977f9faa4b91943f283391f1e
	TeamBravoProject/Library/metadata/76/76649b596be8fc54586441102c33ce9f
	TeamBravoProject/Library/metadata/7e/7e43471c1b718b74ca4380ad3503eef9
	TeamBravoProject/Library/metadata/87/874ea94c83ac0e846ad6d6731263d832
	TeamBravoProject/Library/metadata/88/88eba2c656f7f4040bf13b696f6ecb20
	TeamBravoProject/Library/metadata/89/89e0fa1f3b507cc408d708225b90d03f
	TeamBravoProject/Library/metadata/91/9196397e5a17ba548894555da0a838d6
	TeamBravoProject/Library/metadata/91/91efbdd93b4910645989086515a1fa7d
	TeamBravoProject/Library/metadata/92/92a8797a16eabec44a8bed001f148ee2
	TeamBravoProject/Library/metadata/aa/aaa0032881dacab40b09b2668d410f18
	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/ce/cefe4bcf497ccd340a50cbeb69f5df4c
	TeamBravoProject/Library/metadata/d2/d200a99f23fc5ba4698e3fd2d4dd1a2d
	TeamBravoProject/Library/metadata/d9/d9d3b7d7cc1baec428e048312ce945d0
	TeamBravoProject/Library/metadata/da/da7cf2a4d0403034b8234044c6730cc1
	TeamBravoProject/Library/metadata/e0/e080d2f5b2842eb4d901b6f9be986944
	TeamBravoProject/Library/metadata/e1/e1fa35f14cff72047b1623ab5a88f709
	TeamBravoProject/Library/metadata/e4/e4b4930a82b966141974b7078496092b
	TeamBravoProject/Library/metadata/f7/f75237e0dd32aae43b0a94402c689acf
	TeamBravoProject/Library/metadata/fb/fb07f3b86dba4fe458ad789bb7cb1e10
	TeamBravoProject/TeamBravoProject.userprefs
	TeamBravoProject/Temp/ExportedFBXFile.fbx
	TeamBravoProject/Temp/FBXMayaExport.mel
	TeamBravoProject/Temp/FBXMayaExport5.mel
	TeamBravoProject/Temp/FBXMayaMain.mel