Adding Aidan's work from last week.
Merge branch 'master' of https://github.com/balthorium/coloradobots