added DS_Store to gitignore
Merge branch 'working' of https://github.com/ldoubleuz/flipbox into working