Add devise to Gemfile; add more db:seeds
Install devise gem; create devise views; set up config application and development for devise; adjust seeds
Add devise for authenticaion; users must login or signup to use app; passwords encrypted;
merge conflicts fixed?
Actually fix merge conflicts this time