Added .directory to gitignore
Update authors file
Merge https://github.com/Ahmad-Bamba/612-2014

Conflicts:
	AUTHORS.txt