Adding ListView
Adding ListView
Ading Listview
Merge branch 'master' of https://github.com/jpha226/seniordesign.git

Conflicts:
	Shouter/res/layout/activity_main.xml