local changes
Merge branch 'master' of github.com:ravishtiwari/html-site

Conflicts:
	src/index.html