Add chart to Cigarette
Merge branch 'master' of github.com:Jagbomb/qsclient

Conflicts:
	controllers/cigarette.js
	views/templates/cigarette.html