.gitignore html/ folder
Merge branch 'master' of https://github.com/blasterbug/glossygloss