bad
Merge branch 'master' of https://github.com/CMPUT301W14T14/Team14RecipeFinder
kakaka
Conflicts:
	App/bin/classes/activity/PublishActivity$CommitClick.class
debug successful