Update Max and Brian's code
Merge branch 'master' of https://github.com/balthorium/coloradobots