corrected server db
Merge branch 'master' into server
first part of details.jade added
Merge branch 'master' into server
user deletion works
merged user.js
corrected db