trying to pull.
Merge branch 'master' of https://github.com/terfan/pennapps2013f
entering struggles enabled
updates