Added testing
Merge branch 'branch1'

Conflicts:
	mysecond.txt