Updated .DS_Store entry.
Delete .gitignore
Updated .DS_Store entry again again
Delete .gitignore
merge develop and master branches, set version 1.1
Merge branch 'master' into develop