Two lines in first file
Adding a second line
Revert "Adding a second line"

This reverts commit b384d3fd88bd0dca674a47d7ff514fb7635e9923.
Revert "Revert "Adding a second line""

This reverts commit b179290fafb7efca3ae17fa6853bdead4d9c44d4.
Merge branch 'master' of https://github.com/SnowTone/MyFirstRepository

Conflicts:
	First file.txt