idk
Merge branch 'master' of https://github.com/puent1/nozamA2.git
Merge branch 'master' of https://github.com/puent1/nozamA2.git
Added reply button
Merge branch 'master' of https://github.com/puent1/nozamA2.git
Merge branch 'master' of https://github.com/puent1/nozamA2.git

Conflicts:
	bin/AndroidManifest.xml
	bin/classes.dex
	bin/classes/uiuc/cs411/nozama/R$id.class
	bin/classes/uiuc/cs411/nozama/R$layout.class
	bin/classes/uiuc/cs411/nozama/R$menu.class
	bin/classes/uiuc/cs411/nozama/R$string.class
	bin/classes/uiuc/cs411/nozama/R$style.class
	bin/classes/uiuc/cs411/nozama/network/DatabaseTask.class
	bin/classes/uiuc/cs411/nozama/ui/SearchPostListAdapter.class
	bin/resources.ap_
	gen/uiuc/cs411/nozama/R.java
Merge branch 'master' of https://github.com/puent1/nozamA2.git
Changed xml for list item