Tim's edit for design doc
Merge branch 'master' of https://github.com/ldowson/cs140winter2014