Forgot Types.hs
waldkö
Merge branch 'term' of git://github.com/lordi/flowskell into term

Conflicts:
	src/Terminal/Terminal.hs
	src/Terminal/Types.hs
Fix merge errors in Terminal.Test