no message
Merge branch 'master' of https://github.com/lotsoframen/pictionaryhelper

Conflicts:
	public/js/pictionary.js