no message
Merge branch 'master' of https://github.com/birdimus/testing

Conflicts:
	imageTest.png