Apply Minor Checkout Changes.
Merge branch 'mainactivity' of
https://github.com/casperghost00/splitdish.git into mainactivity

Conflicts:
	SplitDish/src/com/splitdish/consumer/CheckOutActivity.java
Small commit.