Works!
Merge branch 'master' of github.com:pencilcheck/Spicewords

Conflicts:
	www/templates/message.html