started implementation of express authentication
fixed merge conflicts