Merge pull request #1 from kkloste/master

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

Conflicts:
	project.txt
Merge pull request #2 from kkloste/master

test merge
Merge branch 'master' of https://github.com/Harshal91/gitworkshop
mergin
Merge pull request #1 from Harshal91/master

Merging again, changes to projtect.txt