Filters for sales
Merge branch 'master' of https://github.com/vegaro/cse_135_project

Conflicts:
	cse135/src/dao/SalesDao.java