added edits
Merge branch 'gh-pages' of https://github.com/shancarter/j221-fall-2013 into gh-pages