added user name and type
Merge branch 'master' of github.com:paul-musgrave/peppermint

Conflicts:
	js/app.js