updated seeds.rb
merged. Merge branch 'master' of github.com:JAND-Band/taste_maker_app
user can sign up, take a quiz, see personality splash page or retake the quiz and see the new personality splash page
Merge branch 'master' of github.com:JAND-Band/taste_maker_app
fixed merge conflicts