completed basic test
Merge pull request #4 from peoplemerge/master

completed basic test