Merge branch 'master' of https://github.com/saintec2357/HTML5Application

Conflicts:
public_html/index.html