Revert "Merge branch 'master' of https://github.com/LisaHelm/UpStage2013"

This reverts commit f8783d57c006c0cf91638f45f1f1a7dc8c2c4964, reversing
changes made to 800886c07bccf2f09015afef3f349c6b30099977.