Waahhh
Merge branch 'master' of https://github.com/colin353/mushuduck

Conflicts:
	js/main.coffee
message sending working?`