short but sweet message
Merge branch 'master' of https://github.com/ericc123/eric_code_repository
changed html file