test folder
merge tests
Merge pull request #2 from chuckcwh/chuck

Chuck merge for Codeship