Added pricing activity
Merge branch 'master' of https://github.com/patrickhulce/food-stand-tracker

Conflicts:
	FruitStandTracker/gen/edu/upenn/cis350/project/R.java