Proper Retreat

Fixes #60
New Default Deck
Merge branch 'master' into gh-pages