added reply reply
Merge branch 'master' of https://github.com/CMPUT301W14T14/Team14RecipeFinder
bad
Conflicts:
	App/bin/MainActivity.apk
	App/bin/classes.dex
	App/bin/classes/activity/CommentPageActivity.class
	App/bin/classes/activity/PublishActivity$AttachClick.class
	App/bin/classes/activity/PublishActivity$CancelClick.class
	App/bin/classes/activity/PublishActivity$CommitClick.class
	App/bin/classes/activity/PublishActivity.class
	App/bin/classes/com/example/projectapp/R$id.class
	App/bin/dexedLibs/android-support-v4-8ff7cc9f731977149a4a4dcd37bc8f5f.jar
	App/bin/dexedLibs/gson-2.2.4-38544cb61662c895f8d9477de0214f90.jar
	App/bin/dexedLibs/gson-2.2.4-javadoc-88c7185cc413d2529ef94fb11430f55c.jar
	App/bin/dexedLibs/gson-2.2.4-sources-76d5aa576b15e7ba5f0b34d966790707.jar
	App/bin/resources.ap_
	App/gen/com/example/projectapp/R.java