final version
Merge branch 'master' of https://github.com/Johnbug/daye

Conflicts:
	models/user.js