html update
Merge branch 'frontend-dev' of https://github.com/jamescgibson/ufwicse-hack into frontend-dev