kk23537 tests
Merge branch 'master' of https://github.com/cs371p-fall-2014/life-tests