fixing git
Merge branch 'master' of https://github.com/STORM-FTC-4390-7433/FTC-7433-Main-2013

Conflicts:
	hang.c