Merge branches 'responsivePortfolioRedux' and 'master'