What do I say?
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved Conflicts:
	TestMode.cpp
Ultrasonic working in test mode.

Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

resolved Conflicts:
	Phoenix2014.h
Ultrasonic working in test mode

Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

resolved Conflicts:
	Phoenix2014.h