Jdoc stuff
Added junit folder.
Merge branch 'master' of ssh://github.com/Torboto/cmput301W13T07

Conflicts:
	Team07RecipeFinder/src/ca/ualberta/cs/team07recipefinder/ViewRecipeActivity.java