min adds a line
Merge branch 'master' of https://github.com/hex705/masterTester

Conflicts:
	steveAdd_1.txt