Merge pull request #5 from WhosOutThere/master

Merge
updated codebase and tests

josh and shuotian
added phpunit tests, josh and shuotian
Merge pull request #6 from WhosOutThere/joshuashuotianiteration4

Joshuashuotianiteration4