Fixed errors
Merge branch 'master' of github.com:Chantilly612Code/612-2014

Conflicts:
	main.cpp
Removed windriver files and added them to gitignore
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Minor Smoothjoystick tweaks
Merge pull request #29 from ChampD/master

Minor Smoothjoystick tweaks
Merge pull request #30 from ethanhuey/master

Updated Shooters, Updated ports.h, Fixed controls.h
Fixed the registries
Merge branch 'master' of github.com:Chantilly612Code/612-2014

Conflicts:
	SmoothJoystick.cpp
	SmoothJoystick.h
	main.cpp
Added isAxisZero to SmoothJoystick
Merge pull request #31 from ChampD/master

Added isAxisZero to SmoothJoystick
Merge branch 'master' of http://github.com/AdrianDeVera/612-2014
Merge pull request #32 from AdrianDeVera/master

DriveTrain; added update function (for update registry)
Re-Coded isAxisZero
Merge branch 'master' of github.com:Chantilly612Code/612-2014
Merge branch 'adrian' of https://github.com/ethanhuey/612-2014
Merge pull request #33 from ChampD/master

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