Merge pull request #27 from jpark1120/master

fixed a catastrophic merge conflict error from before in movies.js
styling and UX text
Merge branch 'master' of github.com:LizCira/screen_test
added some css changes
Merge branch 'master' of github.com:LizCira/screen_test
styling pop up box
fixed line spacing in popup box
Merge branch 'master' of github.com:LizCira/screen_test