Untracked R.java and added some code for integration
Merge branch 'master' of
ssh://git@github.com/lagecamp/CMPUT301W13T02.git

Conflicts:
	Team2RecipeFinder/gen/ca/ualberta/team2recipefinder/R.java