Moved the two lines to next paragraph
Merge branch 'master' of https://github.com/bdupau/a

Conflicts:
	mytext.txt
added mytext.txt again