small update to user model
Merge branch 'master' of https://github.com/IvayloGeorgiev/JokeBook

Conflicts:
	Server/config/routes.js