pr test
Merge pull request #5 from Swap-Meet/karlagain

pr test
Merge pull request #6 from Swap-Meet/anotherNewFeature

Another Feature, right ehre!
Travis, no likey