Ugly code but it seems to work correctly
Merge commit '949edd7382928d72d2a5f90c350ff09771d91724'

Conflicts:
	slackserver.js
help msg
Help msg
Merge pull request #8 from olamothe/master

!combine