Merge branch 'master' of https://github.com/pambas/jons-mixture-boilerplate

Conflicts:
public/styles/sass/styles.scss
templates/index.liquid
Resolve Conflicts