c3 charts
Merge branch 'master' of github.com:ashsidhu/git-visualised

Conflicts:
	js/app.js