adding our tests
Merge branch 'master' of github.com:cs371p-spring-2013/cs371p-life-tests