Bare-bones front-end added.
Fixed merge conflict in index.html.