lets give travis ci a shot
Merge branch 'master' of github.com:JuhaniImberg/haapa