Merge branch 'master' of https://github.com/hemantgore/GitGubDemo

Conflicts:
header.html
Resolved
Reolve conflict