add html
resolve conflic?
Merge branch 'master' of https://github.com/ghoulmann/breif-tech-resume