sales totals WIP
Merge branch 'master' of git@github.com:vegaro/cse_135_project.git

Conflicts:
	cse135/src/controller/DashboardController.java