steve adds without knowing min
Merge commit '7287982b9b98a58badc65040e8cc1d15df28fa2e'

Conflicts:
	steveAdd_1.txt
manually fixed