Added test file
Merge branch 'master' of github.com:sblackthorne/cs184repo