fgfg
Merge branch 'master' of https://github.com/dan-bruce/TDDExample

Conflicts:
	TestMultiplication/Dollar.java
	TestMultiplication/TestDollar.java