That's much better ...
Merge branch 'master' of https://github.com/michelebraidotti/scripts

Conflicts:
	haskell/encode.hs