i changed the password

just change the password if you can't get in!
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/database.js