syncing up

Syncing changes from past few weeks, added GUI file browser