jack's tests
Merge branch 'master' of https://github.com/cs373-fall-2013/cs373-netflix-tests