working on sql commands
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/src/cs169/project/thepantry/DatabaseModelHelper.java
test case project
database added
Merge branch 'master' of github.com:jfmyers9/ThePantry

Conflicts:
	ThePantry/src/cs169/project/thepantry/DatabaseModel.java
Merge branch 'master' of github.com:jfmyers9/ThePantry