Merge branch 'gh-pages'
Merge branch 'master' into working-branch
added break points to footer
changed style of email
Merge branch 'working-branch'
Merge branch 'master' into gh-pages