bad
Merge branch 'master' of https://github.com/CMPUT301W14T14/Team14RecipeFinder
bad
Conflicts:
	App/bin/classes/activity/HomePageActivity.class
	App/bin/classes/activity/LoginViewActivity$1.class
	App/bin/classes/activity/LoginViewActivity.class
	App/bin/classes/activity/PublishActivity.class
	App/bin/classes/com/example/projectapp/R$id.class
	App/gen/com/example/projectapp/R.java