fixes postgresql conflict, changes home page carousel content
Merge branch 'master' of github.com:MarcGarreau/the_pivot