settings
Merge branch 'master' of github.com:jqr108/angel-carousels