Added .directory to gitignore
Merge branch 'master' of github.com:Ahmad-Bamba/612-2014