I added a line about the project copied from tuubi
Merge branch 'master' of github.com:natalijk/SoftEng2013

Conflicts:
	README.md
I try to solve a confict
will I succeed this time?