modified first line
Fixed first line

Merge branch 'joe_test'

Conflicts:
	testing.txt