Added deck
Merge branch 'master' into gh-pages
style changes
Merge branch 'master' into gh-pages