commiting
Merge branch 'master' of https://github.com/Harshal91/gitworkshop

Conflicts:
	project.txt
Merge branch 'master' of https://github.com/Harshal91/gitworkshop
mergin