Done merging
Merge branch 'master' of github.com:knusbaum/haskell-practice

Conflicts:
	Gossip.conf