Conflict?
Merge branch 'master' of github.com:rvanlaar/tester

Conflicts:
	README.txt