Initial carousel work.
Clear conflicts.
Merge branch 'master' of github.com:heliosdesign/heliossite