12/3/14_2
Merge pull request #15 from K-McK/master

12/3/14_2
Merge branch 'master' of https://github.com/pjtnt11/CascadeEffect2014 into pjtnt11-master

Conflicts:
	src/lib/abs_ramp_mission.h
Merge branch 'pjtnt11-master'
Merge pull request #3 from GotRobotFTC5037/master

sync up
12/3/14_3
Merge pull request #16 from K-McK/master

12/3/14_3
12/6/14
Merge pull request #17 from K-McK/master

12/6/14
Merge branch 'master' of https://github.com/pjtnt11/CascadeEffect2014 into pjtnt11-master

Conflicts:
	src/auto.c
	src/lib/abs_auto_end.h
	src/lib/abs_ramp_mission.h
	src/lib/abs_sensors.h
Merge branch 'pjtnt11-master'
Merge pull request #7 from GotRobotFTC5037/master

sync up