shop name in admin template
made the tweeting frekkin work
Merge branch 'master' of github.com:diversify/digitaldiamonds

Conflicts:
	client/digitaldiamonds.html
	client/routes.js
Merge branch 'master' of github.com:diversify/digitaldiamonds