progress
Merge branch 'master' of https://github.com/Objelisks/everypunk

Conflicts:
	bot.js
	progress.json