another commit just to be able to merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	FooBook/gen/ca/ualberta/cmput301w13t11/FoodBook/R.java
Merge branch 'master' of https://github.com/CMPUT301W13T11/FoodBook.git