gun with character
metadata
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Assets/3D Models/gunDesign2.mb.meta
	TeamBravoProject/Assets/SoundReaveScene.unity
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/InspectorExpandedItems.asset
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/46/465844740b5921845a3e067f6f8abd8a
	TeamBravoProject/Library/metadata/a8/a89d154a75b24ca45b933b853f06b4b8
	TeamBravoProject/Library/metadata/cf/cfaae17c72272df46af4f6e2a57a318a
	TeamBravoProject/TeamBravoProject.userprefs