commited
Merge branch 'master' of https://github.com/vishwadeep28/dummy1

Conflicts:
	.gitignore