Elevator code changed to talons
Merge branch 'master' of https://github.com/phoenixfrc/Phoenix2014

Resolved Conflicts:
	Phoenix2014.h
Fixed?