Finished folder navigation
Merge pull request #30 from greuze/task/folder_navigation

Finished folder navigation