Intermediate commit, please ignore.
Merge branch 'master' of https://github.com/hartenfels/FSMLplusplus

Conflicts:
	FSML++.layout
	src/table.cpp