nick's first web commit
Merge pull request #5 from nickbales/master

New test file added