A3 Base Working; tested with py.test
Merge remote-tracking branch 'origin/master'

Conflicts:
	mining.py
	test_mining.py
A3 Base Working; tested with py.test