User files now appear in file list.
Merge branch 'master' of https://github.com/andrenmelo/scissors