fixes?
fixing a randomness bug
Merge remote branch 'origin/pug' into twisted

Conflicts:
	bot.py
	get_puppy.py
more refactoring