I'm checking in - John
name_input (Git Signin.txt)
input_change(Git Signin.txt)
name_change(Git Signin.txt)
Merge branch 'master' of https://github.com/FRC900/2014RobotCode

Conflicts:
	Git Signin.txt