renamve folder name
merge gitignore
Merge branch 'master' of https://github.com/santonil2003/test

Conflicts:
	.gitignore