Refactor
Fix generateHTML()
Implement edit
Merge branch 'master' into gh-pages