Just a test for travis
Merge branch 'master' of github.com:atomfrede/animated-octo-adventure