sign up to create user
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/database.js
	views/angular/app.js
1