Created web application project and fixed HTML5 issues.
Fixed .gitignore merge conflict