rm .gitignore
Merge branch 'gh-pages' of https://github.com/ucsb-bren/esm296-4f into gh-pages