Merge branch 'master' of http://github.com/AdrianDeVera/612-2014
Re-Coded isAxisZero
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge pull request #33 from ChampD/master

Smoothjoystick
Merge branch 'master' of http://github.com/Chantilly612Code/612-2014
Added Pneumatics, smoothjoystick, and drivetrain to function registry
Merge pull request #35 from ChampD/master

Added Pneumatics, smoothjoystick, and drivetrain to function registry
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
ben's changes
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Merge pull request #36 from BenNgu/master

ben's changes
Renamed is axis zero to getTriggerState in order to better describe the method
Merge pull request #37 from Ahmad-Bamba/master

Renamed is axis zero to getTriggerState in order to better describe the method
updated .gitignore
Merge branch 'master' of http://github.com/Chantilly612Code/612-2014

Conflicts:
	.gitignore
Merge pull request #38 from ZackAlfakir/master

.gitignore
Merge branch 'master' of https://github.com/Chantilly612Code/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
Merge branch 'master' of https://github.com/AdrianDeVera/612-2014 into adrian

Conflicts:
	DriveTrain.cpp
	DriveTrain.h
dos2unix line endings (woo line changes)
Merge branch 'master' of https://github.com/AdrianDeVera/612-2014

Conflicts:
	DriveTrain.cpp
	DriveTrain.h