Updating files
Merge branch 'master' of https://github.com/cs373-summer-2014/netflix-tests