tests for discussion, merge travis
Merge pull request #7 from LegoStormtroopr/tests

tests for discussion, merge travis