user.js added
Merge branch 'master' of https://github.com/wenqf11/watt

Conflicts:
	.idea/workspace.xml
	models/Book.js