adding new users
Merge branch 'master' of https://github.com/joemercer/stachetag

Conflicts:
	server.js