listview
merge conflict resolved
Merge pull request #5 from kcampen/listview

Listview