Adding Nick's week2 work.
Merge branch 'master' of https://github.com/balthorium/coloradobots