First commit from dev.local
Merge branch 'master' of https://github.com/kristinpeterson/myonlinestore