set up auth, no pw yet
resolve conflicts in routes.rb
fix routes
little auth action
resolve conflicts in routes
auth works, no password yet
resolve merge conflicts
photo upload works
fixed merge issues