Added the tuple ('2004/08', 104.66) in six_worth_months() test cases because Prof Sim said the original test file was incorrect
Merge remote-tracking branch 'origin/master'

Conflicts:
	mining.py
	test_mining.py