TEsting around
Merge branch 'master' of https://github.com/rcabreu/Tester into feature1

Conflicts:
	LICENSE