Index html/haml files
Merge branch 'master' of https://github.com/backus/cs184-hw3