Add .orig files in gitignore
Merge branch 'develop' of github.com:batspirit/Imagine into develop