WIP
Merge branch 'testing' of github.com:saep/XHBMonad into testing

Conflicts:
	XHBMonad/Core.hs