Hello World
Merge branch 'master' of https://github.com/anidev/612-2013
Merge branch 'master' of git://github.com/JeffTolbert/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge pull request #67 from swarage/master

Added functions to lift -Zack
Merge branch 'master' of https://github.com/anidev/612-2013
pot-angle functions
two_controller stuff and shooter/launcher/feeder/lift uses suzie
Deletes jags in drivetrain
Merge branch 'master' of github.com:anidev/612-2013
Minor Changes
Minor Change
Fixes dependency hell
Fixed two_controller template and added specialized Relay template
Formatted lift.cpp and ports.h and added correct ports.h pot hw_info
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp
Merge pull request #68 from JeffTolbert/master

Minor Changes with big impacts
Line endings for presets.cpm
encapsulated shifter in drivetrain