Mark Watts and Michael Carrillo tests
Merge branch 'master' of github.com:cs371p-fall-2013/cs371p-darwin-tests