test commit 1
Merge branch 'master' of https://github.com/avikaco/Test-Inanta-GIT

Conflicts:
	index.html