minor edits
Merge branch 'master' of https://github.com/brownplt/iticse-in-flow-2014