Shaping tests
adding test to check collaboration
makeup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/java/com/softwarfair/mockbasics/ReportMakerTest.java