Merge pull request #12 from reboryan/master

Made additions to view and CSS files
update english-french/spanish.txt to allow proper db:seed
Merge pull request #13 from tihuan/master

update english-french/spanish.txt to allow proper db:seed
new trivia questions and answers: movies
Merge pull request #14 from keaty/master

new trivia questions and answers: movies
conflicts resolved