wrote some tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_mining.py
wrote some tests
Merge remote-tracking branch 'origin/master'