Second deploy tool test
Built cocktails from commit 185ebb6 on branch master
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gruntfile.js