wip
merge conflict resolved
Add folder uniqueness test
Merge branch 'master' of https://github.com/adthul/blank_canvas