changed filepaths for test
Merge branch 'master' of https://github.com/eallison91/CSE-403-Spring2014