changed directory activity to a tabbed activity for aesthetic purposes
Merge pull request #41 from dewguzzler/master

directory activity is now tabbed hopefully with no conflicts
Merge remote-tracking branch 'upstream/master'