ignoring .DS_Store
Merge branch 'dev' of https://github.com/yusuf-a/yusufali into dev