Merge branch 'master' of https://github.com/ellina-s/cs304 into ellina
Implemented Item Search based on category and title
Added checks for item quantity
Merge branch 'master' of https://github.com/ellina-s/cs304 into ellina
Minor comments changes
Merge pull request #16 from ellina-s/ellina

Ellina
Merge branch 'master' of https://github.com/ellina-s/cs304 into arjan