trigger travis
Merge branch 'master' of https://github.com/newslynx/journagenerator