Added more functions.
Merge branch 'master' of github.com:psibi/rwh

Conflicts:
	free/Free.hs