nothing done
merged updated
Merge branch 'master' into greg
Merge branch 'master' of github.com:Starlight-Design/midterm into greg
login done
conflicts fixed, login and register in actions.rb"
conflicts, login and register