Merges
Merge branch 'master' of https://github.com/anidev/612-2013
Launcher Updater Added
Minor Changes
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	612.h
	autonomous.cpp
	launcher.cpp
	launcher.h
	lift.cpp
Merge pull request #70 from JeffTolbert/master

Changes