Use redundant channels for waypoints
Merge branch 'master' of github.com:ryancheu/Battle2013Team0

Conflicts:
	MineTurtle/Robots/Types/HQNormalType.java
	MineTurtle/Util/Constants.java