removed dependencies that weren't in 2015
created gitsignin.txt
Added name to gitsignin.txt
Merge branch 'master' of https://github.com/FRC900/2014RobotCode
I'm checking in - John
name_input (Git Signin.txt)
Added Name
input_change(Git Signin.txt)
name_change(Git Signin.txt)
Merge branch 'master' of https://github.com/FRC900/2014RobotCode

Conflicts:
	Git Signin.txt
I added my name.
updating git signin.txt
updated to correct ultrasonic code, attempted to create dashboard control for encoder autonomous
Merge branch 'master' of https://github.com/FRC900/2014RobotCode
disabled braking PID
Merge branch 'master' into Branch_a6316c8d82e5b9a7a7b8e76e53cb2b2481c77f63

Conflicts:
	900/Drive/pidMotor.vi
	Teleop.vi