Added inventory
merging
removed bin tracking
Fixed res/xml issues
Deleted bin and gen files
remerging
Merge branch 'master' of github.com:patrickhulce/food-stand-tracker

Conflicts:
	FruitStandTracker/bin/classes/edu/upenn/cis350/project/SaleActivity.class
	FruitStandTracker/res/layout/activity_start.xml
Ugly merge
Began writing testing procedures