added folder button back to folder view (lost in merge conflict)
Merge pull request #38 from makersquare/folder_button

added folder button back to folder view (lost in merge conflict)