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

Conflicts:
	TeamBravoProject/Assets/New Folder/The Chase - Mid.wav
	TeamBravoProject/Assets/Objects/PlayerObjectv5.prefab
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/InspectorExpandedItems.asset
	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.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/02/02994fd3a0d94a047b268f09eb23cccf
	TeamBravoProject/Library/metadata/08/08737ec9735d2e94ca75770362fe1a39
	TeamBravoProject/Library/metadata/08/08c82e382f408124b96a00a1ddea4ce1
	TeamBravoProject/Library/metadata/0a/0aa86e9325cb6194c99176013e4ea676
	TeamBravoProject/Library/metadata/0d/0daae816c347f5f4a9727364260f4ce2
	TeamBravoProject/Library/metadata/11/113d8f67db4aa79409dddc94f56d858c
	TeamBravoProject/Library/metadata/11/11ff169b3aa890d4286c0850e9ab8128
	TeamBravoProject/Library/metadata/19/193e7b95358ad0f4999f488ca20b60c2
	TeamBravoProject/Library/metadata/22/227f20f53a16ab547abbdbbad1c82663
	TeamBravoProject/Library/metadata/23/237a47800a361324fad6eaaae75ee72e
	TeamBravoProject/Library/metadata/23/23b31a7b16561f84d8fab04ef84772d8
	TeamBravoProject/Library/metadata/30/308a749a34a5fe14ea4b288b547802dd
	TeamBravoProject/Library/metadata/33/3356577f531788647bb7234e8313d502
	TeamBravoProject/Library/metadata/35/3551f0aaf33f79448b83ee05dca3e624
	TeamBravoProject/Library/metadata/37/37a6304f5fdeff148803c11061997c0b
	TeamBravoProject/Library/metadata/3b/3b5d27385aede7942bfd60e33a188c25
	TeamBravoProject/Library/metadata/3f/3f344e4ac9c14464faa8553c40d0dcf6
	TeamBravoProject/Library/metadata/41/412240e15f836904e9afd162ba201e4c
	TeamBravoProject/Library/metadata/5b/5b8e91b2a204d1f4cb5ae8ff3ef99cdc
	TeamBravoProject/Library/metadata/60/60099c40f8e21414281435c227c5a593
	TeamBravoProject/Library/metadata/62/62ea377b911ce9c4f9b8d5e4b3316a6c
	TeamBravoProject/Library/metadata/6a/6acc29cb9bb828843b3002c9c8e80ca1
	TeamBravoProject/Library/metadata/6c/6cc78cc977f9faa4b91943f283391f1e
	TeamBravoProject/Library/metadata/79/7956efced0e60d343bb0b5f26d545624
	TeamBravoProject/Library/metadata/85/85e5fbee04d67464bbbae0c05887491a
	TeamBravoProject/Library/metadata/8a/8a94c2878dd3e904dad80a9e17873a77
	TeamBravoProject/Library/metadata/93/934d0d82b0d1e4a4194ed7f4eac02689
	TeamBravoProject/Library/metadata/95/959e3cb3b0813f240a2496d995103b31
	TeamBravoProject/Library/metadata/95/95d1963be6e64554a9329b6ea1f983bb
	TeamBravoProject/Library/metadata/97/973303d8fd8a1b94a985b3efa2d416f8
	TeamBravoProject/Library/metadata/9b/9bb53de746df65b4f8d8108c692e1b10
	TeamBravoProject/Library/metadata/a3/a3e93fed695ae274d9fd6e758949c170
	TeamBravoProject/Library/metadata/a9/a9414abecb04c8b4385b1e74b4e774f8
	TeamBravoProject/Library/metadata/a9/a993bca20fd6bdb42ae93d31800a0c85
	TeamBravoProject/Library/metadata/ac/ac3ad2a9031bb944ca52c99e17f57295
	TeamBravoProject/Library/metadata/b8/b846489df5be92945b7a6a6a67294106
	TeamBravoProject/Library/metadata/bc/bc3a5ac5375bdf84e8fda85cae5065c1
	TeamBravoProject/Library/metadata/c2/c22be6c8ebdf7d4429b20407c87fb2ae
	TeamBravoProject/Library/metadata/ce/cefe4bcf497ccd340a50cbeb69f5df4c
	TeamBravoProject/Library/metadata/d9/d9f6318af9aa9ae4d954825d483311ef
	TeamBravoProject/Library/metadata/db/db413f2f44f290640bd963a0a83f64b5
	TeamBravoProject/Library/metadata/e4/e48f8beb3933ba64193402114e6473b6
	TeamBravoProject/Library/metadata/e6/e6c06fdbd45a731409d4d166bc6fb67e
	TeamBravoProject/Library/metadata/e8/e827aa045da14c246a188da228ecde5a
	TeamBravoProject/Library/metadata/f1/f1f16c2c58d02834ca494d0ba50712e8
	TeamBravoProject/Library/metadata/f3/f36007e2df8a98548ac919a4ac86b011
	TeamBravoProject/Library/metadata/f3/f3fc90e749c345341b24a9894ab8da5c
	TeamBravoProject/Library/metadata/fc/fcd95664a9331644f890defa32d3d11e
	TeamBravoProject/Temp/ExportedFBXFile.fbx
	TeamBravoProject/Temp/FBXMayaExport5.mel
	TeamBravoProject/Temp/UnityTempFile-112a1b720222af44ca3d5c149492045d
	TeamBravoProject/Temp/UnityTempFile-1bf20c87e596fcf4ca548f7b58f258b3
	TeamBravoProject/Temp/UnityTempFile-2ebf933beaad7c24aa63751915e274fd
	TeamBravoProject/Temp/UnityTempFile-330f4876fb2aa1e4eaa1de7bd7abf416
	TeamBravoProject/Temp/UnityTempFile-49efd54564b1dd0448b3549f9c1f9b23
	TeamBravoProject/Temp/UnityTempFile-ba8b42228ec3e61459b6b26cd8f521be
	TeamBravoProject/Temp/__EditModeScene