css, main.js updates
merging merge branch 'master' of https://github.com/alisonkohl/cs247-final-project