Fix issue #57
Merge branch 'master' of https://github.com/mozilla/metrics-graphics

Conflicts:
	index.html
	js/main.js
	js/metrics-graphics.js