Merge pull request #26 from benticsay/master

conflicts resolved in css scripts and index
js chart styling
more chart js styling
fixed index merge conflict
fixed a catastrophic merge conflict error from before in movies.js
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
Merge pull request #28 from jpark1120/master

css changes
final merge hopefully
Merge branch 'master' of github.com:LizCira/screen_test