this is a test
potential travis-ci fix
Merge pull request #55 from fusion94/master

this is a test