ss48333 acceptance tests
Merge branch 'master' of https://github.com/cs370p-fall-2013/cs371p-life-tests