Merge branch 'master' into randomize

Conflicts:
	data/locs.json
Merge branch 'master' into randomize
Merge pull request #6 from mplewis/randomize

Randomize
Merge branch 'master' into progress-stats