Merge branch 'master' of https://github.com/Tacahilo/drop_the_latte
Merge branch 'master' of https://github.com/Tacahilo/drop_the_latte
Merge branch 'master' of https://github.com/Tacahilo/drop_the_latte
Fix image url for travis-ci