Local changes being merged with live
Merge branch 'master' of github.com:max-barry/static-site-template