It just works.
It just works.
Merge branch 'master' of https://github.com/flameiguana/project2-cmps179. Also rounded those corners

Conflicts:
	scripts/charts.js