tim & ftc244
Merge branch 'master' of https://github.com/cs371p-fall-2013/cs371p-darwin-tests