groupme fix
Merge branch 'master' of github.com:mpoegel/Team.Me

Conflicts:
	client/client.js