Basic ListView on MyListsActivity with button at top of screen
Commit to fix merge conflicts
Commit to fix merge conflicts
Fix conflicts