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

Conflicts:
	TeamBravoProject/Assets/Beta_Test.unity
	TeamBravoProject/Assets/ScentNodeScript.js
	TeamBravoProject/Assets/lab.mb
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	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/08c82e382f408124b96a00a1ddea4ce1
	TeamBravoProject/Library/metadata/0d/0daae816c347f5f4a9727364260f4ce2
	TeamBravoProject/Library/metadata/33/3356577f531788647bb7234e8313d502
	TeamBravoProject/Library/metadata/88/8883033d8409b2e4d8bb8405ed94dd3a
	TeamBravoProject/Library/metadata/ca/cacb6bad15515be4db9b8777bacaf0a5
	TeamBravoProject/Library/metadata/ce/cefe4bcf497ccd340a50cbeb69f5df4c
	TeamBravoProject/Library/metadata/dd/dd6b98579ba18384d9f7ea9790cb0054
	TeamBravoProject/Library/metadata/f3/f36007e2df8a98548ac919a4ac86b011
	TeamBravoProject/TeamBravoProject.userprefs