graph is now working but not pretty
Merge branch 'master' of https://github.com/bazaargaming/bazaarworldofgaming

Conflicts:
	Gemfile.lock
	db/development.sqlite3