Fixed errors
Smooth Joystick in Progress
Late Test :wq
Merge pull request #25 from KyleTran/master

Late Test :wq
Merge branch 'master' of github.com:Chantilly612Code/612-2014

Conflicts:
	main.cpp
Removed windriver files and added them to gitignore
Done with SmoothJoystick
Removed the unessecary controls.f file
Merge pull request #26 from Ahmad-Bamba/master

Smooth Joystick + Function Registry is ready!
got rid of unecessary files and updated .gitignore
Merge pull request #27 from ZackAlfakir/master

got rid of unecessary files and updated .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
Minor Smoothjoystick tweaks
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