Updating from last day.
Merge branch 'master' of github.com:craftofelectronics/template-site