Ignore this. Timestamp change on copied files.
Remove testing run
Fix shitty math in consumption discounting
Import future division
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	webdice/dice.py
	webdice/equations/consumption.py