Fixed problem with duplicate filenames.
Merge branch 'master' of https://github.com/sgreenstein/salk-a