Remove breaking stuff
Merge pull request #41 from f2prateek/revert-stuff

Revert commits that break the build.
Don't use this yet. Add from https://code.google.com/p/romannurik-code/source/browse/misc/scrolltricks/
ViewPager in MainActivity

Clean up
Merge pull request #42 from f2prateek/pantry-fragment

View Pager in MainActivity
Recipe Loader

This also makes some changes to our model.
Photos will be stored as Uri's.
This way we can have multiple sources (say file or network location)
with the same strucutre, and have the Uri's handle diffeeneitation
betwene the two for us.
Merge pull request #44 from f2prateek/image-loader

Recipe Loader
Add Pantry list - by @ethanmykytiuk

by Ethan, just refactored from
https://github.com/ethanmykytiuk/classproject/blob/pantry-fragment/app/src/main/java/com/cmput301/recipebot/ui/fragments/PantryFragment.java

Couldn't figure out the rebasing.
Merge pull request #45 from f2prateek/pantry-fragment

Add Pantry list - by @ethanmykytiuk

closes 43
Trying to get pantry fragment back to working
Merge branch 'develop' of github.com:CMPUT301W13T06/classproject into pantry-fragment
Recipe Activity
Fix a bug, stress test
Merge pull request #48 from f2prateek/add-recipe

Recipe Activity by @btrinh1
Merge branch 'develop' of github.com:CMPUT301W13T06/classproject into pantry-fragment
Merged my code with Prateeks