Remove Rails ERD gem
Merge branch 'master' of https://github.com/laurenbenichou/psychoviz
Create models
Add user_id to scores table
fix merge conflicts
fixed merge conflicts
fixed merge conflicts
fixed conflicts