wording
Merge branch 'gh-pages' of github.com:ny-haskell/composeconference into gh-pages