Merge branch 'master' of https://github.com/tuftsmake/dash

Conflicts:
index.html
merged with charlie's