Fixed deck
Merge branch 'master' of github.com:wadewegner/FluentConf2014