Committed for kj and en
Merge branch 'master' of https://github.com/cs313e-fall-2014/darwin-tests