first commit
rails skeleton
Merge branch 'master' of github.com:MsRomilaB/Serotonin
preference model added with form submission
test users
Merge branch 'models/testusers'
seed data successfully populated using populator and faker
Merge branch 'models/testusers'
login page added, needs debugging
root changed to users#index
roots changed to index#users
Gemfile updated
basic preferences added
preferences form fixed
fixed conflict
bio column removed from users table
deets now belong to users
Merge branch 'models/info'
pagination and relationships done
Merge branch 'master' of github.com:MsRomilaB/Serotonin