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

Conflicts:
	AUTHORS.txt
Merge pull request #6 from ZackAlfakir/master

Added name to AUTHORS
added myself to authors
Merge pull request #7 from DiegoFontnailla/master

added myself to authors
Starting from scratch with practice code written on 1/11
Foomatics :P
Foomatics :P
Merge pull request #8 from Ahmad-Bamba/master

Added Pnuematics.h and Pnuematics.cpp
Update AUTHORS.txt
Merge pull request #10 from bqtruong/master

Update AUTHORS.txt