Merge branch 'hotfix/controllers-img' into develop
Merge branch 'hotfix/reset' into develop
move CNAME
Merge branch 'gh-pages' of https://github.com/weshardee/wedding into feature/new-deploy-process