.gitignore is now working
Merge branch 'master' of https://github.com/yokesh28/mamatha.git

Conflicts:
	site1/index.html