Edit the javadoc in MainActivity.java
Merge remote-tracking branch 'origin/master'

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