Filters now show what's selected
Merge branch 'master' of https://github.com/vegaro/cse_135_project

Conflicts:
	cse135/src/controller/DashboardController.java