pulled master for changes, no changes
Merge branch 'master' into user_sign_up
created signup form for user
worked on create/new routes for user
Merge branch 'master' into user_sign_up