more stuff
Merge branch 'master' of github.com:jyp/ControlledFusion

Conflicts:
	Fusion.hs