In progress: change password
In progress page account
Merge branch 'master' of https://github.com/ppd7/NODEJSQL

Conflicts:
	routes/user.js