adding tests for mariel4 & fgarcia
Merge branch 'master' of https://github.com/cs371p-spring-2013/cs371p-life-tests