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
Added shooter and controls
Added new entries to ports.h; Shooter uses Talon for puller; RobotInit uses joystick values from ports.h
Split pull function into pullUp, pullDown, etc; added DriveTrain values in ports.h
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