Renamed 2 -> shield.
Merge branch 'gh-pages' of github.com:rosshadden/cs6060 into gh-pages