story3vi Readme.txt
commit2
Merge branch 'story3'
Merge branch 'master' of https://github.com/fkassam/SampleProject

Conflicts:
	Readme.txt
	newFile.txt