style stuff

style!
Merge branch 'master' of https://github.com/fls4507/MyPantry4

Conflicts:
	mptester/src/com/example/mptester/PantryItemListFragment.java
style stuff

style stuff