Merge branch 'feature/composer' into develop
Merge branch 'develop' of github.com:jordifreek/CacheGadget into develop
Preparing new readme file
Changes in README.md
Merge branch 'hotfix/readme'
Resolve merge conflicts
Merge branch 'develop' of github.com:jordifreek/CacheGadget
Added travis.yml
Merge branch 'master' into develop
Uupps...