Added a new line
Merge branch 'master' of https://github.com/chrisrees11/RUCK14

Conflicts:
	file2.txt

Resolved conflicts?