For the love of God, don't commit you R.java guys.  I'm doing it here
because I have to.
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git