no message
Merge branch 'master' of https://github.com/jmsmartins/massive-ninja

Conflicts:
	mydoctest.txt