Implemented Javadoc
Merge branch 'master' of
ssh://git@github.com/jessicayuen/CMPUT301T13.git

Conflicts:
	RecipeFinder/doc/allclasses-frame.html
	RecipeFinder/doc/allclasses-noframe.html
	RecipeFinder/doc/constant-values.html
	RecipeFinder/doc/deprecated-list.html
	RecipeFinder/doc/help-doc.html
	RecipeFinder/doc/index-files/index-1.html
	RecipeFinder/doc/index-files/index-10.html
	RecipeFinder/doc/index-files/index-11.html
	RecipeFinder/doc/index-files/index-12.html
	RecipeFinder/doc/index-files/index-13.html
	RecipeFinder/doc/index-files/index-14.html
	RecipeFinder/doc/index-files/index-15.html
	RecipeFinder/doc/index-files/index-16.html
	RecipeFinder/doc/index-files/index-17.html
	RecipeFinder/doc/index-files/index-18.html
	RecipeFinder/doc/index-files/index-19.html
	RecipeFinder/doc/index-files/index-2.html
	RecipeFinder/doc/index-files/index-20.html
	RecipeFinder/doc/index-files/index-3.html
	RecipeFinder/doc/index-files/index-4.html
	RecipeFinder/doc/index-files/index-5.html
	RecipeFinder/doc/index-files/index-6.html
	RecipeFinder/doc/index-files/index-7.html
	RecipeFinder/doc/index-files/index-8.html
	RecipeFinder/doc/index-files/index-9.html
	RecipeFinder/doc/index.html
	RecipeFinder/doc/overview-tree.html
	RecipeFinder/doc/package-list
	RecipeFinder/doc/serialized-form.html
	RecipeFinder/doc/stylesheet.css
	RecipeFinder/doc/team13/cmput301/recipefinder/BuildConfig.html
	RecipeFinder/doc/team13/cmput301/recipefinder/CreateRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/DisplayRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/ElasticSearchHelper.html
	RecipeFinder/doc/team13/cmput301/recipefinder/ElasticSearchResponse.html
	RecipeFinder/doc/team13/cmput301/recipefinder/ElasticSearchSearchResponse.html
	RecipeFinder/doc/team13/cmput301/recipefinder/EmailSender.ByteArrayDataSource.html
	RecipeFinder/doc/team13/cmput301/recipefinder/EmailSender.html
	RecipeFinder/doc/team13/cmput301/recipefinder/FileExplorerActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/Hits.html
	RecipeFinder/doc/team13/cmput301/recipefinder/JSSEProvider.html
	RecipeFinder/doc/team13/cmput301/recipefinder/MainActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/MyIngredientsActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/Photo.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.attr.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.color.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.drawable.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.id.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.layout.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.menu.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.string.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.style.html
	RecipeFinder/doc/team13/cmput301/recipefinder/R.styleable.html
	RecipeFinder/doc/team13/cmput301/recipefinder/Recipe.html
	RecipeFinder/doc/team13/cmput301/recipefinder/RecipeManager.html
	RecipeFinder/doc/team13/cmput301/recipefinder/SearchRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/SearchResultsActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/User.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/BuildConfig.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/CreateRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/DisplayRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/ElasticSearchHelper.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/ElasticSearchResponse.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/ElasticSearchSearchResponse.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/EmailSender.ByteArrayDataSource.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/EmailSender.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/FileExplorerActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/Hits.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/JSSEProvider.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/MainActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/MyIngredientsActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/Photo.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.attr.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.color.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.drawable.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.id.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.layout.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.menu.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.string.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.style.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/R.styleable.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/Recipe.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/RecipeManager.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/SearchRecipeActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/SearchResultsActivity.html
	RecipeFinder/doc/team13/cmput301/recipefinder/class-use/User.html
	RecipeFinder/doc/team13/cmput301/recipefinder/package-frame.html
	RecipeFinder/doc/team13/cmput301/recipefinder/package-summary.html
	RecipeFinder/doc/team13/cmput301/recipefinder/package-tree.html
	RecipeFinder/doc/team13/cmput301/recipefinder/package-use.html