whatever bro
Merge branch 'master' into hb2

Conflicts:
	honbot/chart.py