some stuff
Merge branch 'master' of https://github.com/stuycs-softdev/proj3-6-finance

Conflicts:
	graphs/graph.js
	graphs/js/graph.js
	graphs/js/pie.js
	graphs/pie.js
	public/graphs/graph.js
	public/graphs/pie.js