Githu is wierd
Githu is wierd

# Conflicts:
#	src/main/java/frc/team4215/stronghold/RobotModule.java
#	src/main/java/frc/team4215/stronghold/UI.java
#	src/main/java/frc/team4215/stronghold/UltraProto.java

TrinityTrihawks/2016