work in progress
work in progress
Merge branch 'master' into users

Conflicts:
	public/js/app.js
	public/js/app.js.map
	server.coffee
Users work in progress

Fixed a tempate issue
work in progress
Clean up
Changed 'username' to 'nick'
added basic users