merge pull request
Maybe also fix double-gc click
version
Fix thousands being given as millions
Merge pull request #35 from flacjacket/numbers_fix

Fix thousands being given as millions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	frozen_cookies.js