Fixed... again.
Merge branch 'master' of github.com:cs371p-fall-2013/cs371p-life-tests