Commit code from week 2.
Merge branch 'master' of http://github.com/balthorium/coloradobots