stuff
Merge branch 'master' of github.com:konscript/whosup

Conflicts:
	client/app/js/app.js
did something with groups
Merge branch 'master' of github.com:konscript/whosup