change
Merge remote-tracking branch 'origin/master'

Conflicts:
	Team2RecipeFinder/bin/classes/ca/ualberta/team2recipefinder/R$id.class
	Team2RecipeFinder/bin/classes/ca/ualberta/team2recipefinder/R$layout.class
	Team2RecipeFinder/bin/classes/ca/ualberta/team2recipefinder/R$string.class
	Team2RecipeFinder/bin/classes/ca/ualberta/team2recipefinder/R$style.class
	Team2RecipeFinder/gen/ca/ualberta/team2recipefinder/R.java
Merge branch 'master' of ssh://git@github.com/lagecamp/CMPUT301W13T02.git