tidying
Merge branch 'master' of github.com:slindley/dependent-haskell

Conflicts:
	Hasochism/hasochism.lhs