frm wrk
Merge branch 'master' of https://github.com/brotherclone/babblebot

Conflicts:
	webclient/dictionary.rb