Folder system updated
Merge branch 'master' of https://github.com/cmurat/CS320-Project