merging
Merge branch 'master' of github.com:Juleship/Resta
carousel?