Update Slack token
Merge branch 'master' of github.com:fshp/BitHack

Conflicts:
	.travis.yml