Merge branch 'master' of https://github.com/charlesrogers/chads-for-chad

Conflicts:
index.html