Commiting changes to same line as Patrick
Merge branch 'master' of github.com:rpr27/FirstRepository

Conflicts:
	secondFile.txt