Commiting because I haven't learned how to stash yet.
merge
Removed confusing extra html file.