Delete .DS_Store
Delete .DS_Store
Delete .DS_Store
Merge pull request #1 from baasbox/master

update from origin repo