Updated gitignore on osx
Merge branch 'master' of https://github.com/Stephanvs/Berry