andrew Solis and Mitch Stephan test files
Merge branch 'master' of github.com:cs373-spring-2014/netflix-tests