change
whatever
Merge branch 'master' of https://github.com/Ansh1234/folder

Conflicts:
	index.html
finally
Merge branch 'master' of https://github.com/Ansh1234/folder
changes by a