Merge branch 'master' into gh-pages
Wiped hard-coded HTML, add item functionality in.
Merge branch 'gh-pages'