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

Conflicts:
	unconference/index.html