added testfiles correctly
Merge branch 'master' of https://github.com/follan/CS184