.gitignore .DS_Store
Merge https://github.com/ibourgeois/NovaScope