initial listview
initial listview
merge conflicts
listview changes
Merge pull request #2 from BrianRivers/listView-test

List view test