Removed .DS_Store that sneaked in during a commit
Merge branch 'master' of github.com:cstegmayr/bitsoccer