fixed bug where the GUIText doesn't show indicating to player about putting weapon into box.
Merge branch 'master' of https://github.com/tskeet/IFDM491BravoTeam

Conflicts:
	TeamBravoProject/Library/AssetServerCacheV3
	TeamBravoProject/Library/CurrentLayout.dwlt
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll
	TeamBravoProject/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	TeamBravoProject/Library/assetDatabase3
	TeamBravoProject/Library/guidmapper
	TeamBravoProject/Library/metadata/5e/5ec8c94a5bf3eac498231fa912889a36
	TeamBravoProject/Temp/ExportedFBXFile.fbx
	TeamBravoProject/Temp/FBXMayaExport.mel
	TeamBravoProject/Temp/FBXMayaExport5.mel
	TeamBravoProject/Temp/FBXMayaMain.mel
	TeamBravoProject/Temp/UnityTempFile-74e9932a976c0314a97b595f3325fc55
	TeamBravoProject/Temp/__EditModeScene