nothing done
merged updated
Merge branch 'master' into greg
Merge branch 'master' of github.com:Starlight-Design/midterm into greg
login done
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
login and register front end
front end shit 1
Merge branch 'thomas'
login and register pages
Merge branch 'master' of github.com:Starlight-Design/midterm
Merge branch 'thomas'
merging frontend
blahad