Merge pull request #2 from GotRobotFTC5037/master

sync up
Merge pull request #8 from K-McK/master

Merge pull request #1 from GotRobotFTC5037/master
Added Auto 2
Merge pull request #3 from GotRobotFTC5037/master

fixes from Kristen
Merge pull request #9 from K-McK/master

Merge pull request #1 from GotRobotFTC5037/master
Merge pull request #4 from GotRobotFTC5037/master

configuration changes
added part of mission 2
Merge pull request #10 from K-McK/master

Auto and smoke test updates
resolving merge conflicts
Merge branch 'master' of https://github.com/pjtnt11/CascadeEffect2014 into pjtnt11-master

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

sync up