Re-enable convert
Merge branch 'master' of github.com:blanu/Dust
Removed duplicate entry in modules list
Merge branch 'master' of github.com:blanu/Dust
Documentation on the Dust key exchange protocol
Merge branch 'master' of github.com:blanu/Dust

Conflicts:
	hs/Dust.cabal