Changed to count to 15, added more comments
Merge branch 'slave'

Conflicts:
	script.sh

resolved conflict by deleting comments