Merge pull request #5 from GotRobotFTC5037/master

sync up
Merge pull request #6 from GotRobotFTC5037/master

sync up
Fixed mission 2
Merge branch 'master' of https://github.com/pjtnt11/CascadeEffect2014 into pjtnt11-master

Conflicts:
	src/lib/abs_ramp_mission.h
Merge branch 'pjtnt11-master'