Merge branch 'master' of https://github.com/MKAT/inf1340_2014_asst3

Conflicts:
	mining.py
Merge remote-tracking branch 'origin/master'

Conflicts:
	mining.py