Up to date
Merge branch 'gh-pages' of https://github.com/idieye/CS121-work into gh-pages