Database.yml updated
Merge conflict fixed in Gemfile.lock
New migration added seen and rating columns to movies
Merge pull request #3 from RDFroeber/master

New Migration Added