nothing done
merged updated
Merge branch 'master' into greg
Merge branch 'master' of github.com:Starlight-Design/midterm into greg
enabled session, created register and log out
login done
added validations to user.rb
Merge branch 'nicks'
login done
conflicts fixed, login and register in actions.rb"
resolved conflict, login and regiter ready to test
conflicts, login and register
reorganizing
front end shit 1
Merge branch 'thomas'
Merge branch 'master' of github.com:Starlight-Design/midterm
Merge branch 'thomas'
merging frontend
frontend catastrophe evaded
hi