conflict
Merge branch 'master' of https://github.com/RockemSockem/test1

Conflicts:
	new.txt