Delete .DS_Store
Merge branch 'dev'
Fixed Path Issues
Merge branch 'master' into dev