index on master: f46dd59 Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa
On master: debuggin merchello
Debugging merchello - pulling new codes
Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa

Conflicts:
	SherpaAdventureGear/SherpaAdventureGear/App_Data/Logs/UmbracoTraceLog.txt
Merge branch 'master' of https://github.com/BonsaiMediaGroup/Sherpa

Conflicts:
	SherpaAdventureGear/SherpaAdventureGear.v11.suo
	SherpaAdventureGear/SherpaAdventureGear/App_Data/Logs/UmbracoTraceLog.txt
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.dll
	SherpaAdventureGear/SherpaAdventureGear/bin/SherpaAdventureGear.pdb