meh
Merge branch 'master' of github.com:thyphoon/test

# By Sebastian Cohnen
# Via Sebastian Cohnen
* 'master' of github.com:thyphoon/test:
  meh
added travis config