put slides
Merge branch 'master' of https://github.com/nokachi/haskell-talk

Conflicts:
	README.md