Travis CI
Build status
Merge branch 'develop' of https://github.com/karlll/kjell into develop

Conflicts:
	.travis.yml