Removed .DS_Store files
Merge branch 'dev' of github.com:shawkinsl/ProjectBlock into dev