Merge branch 'tp4-did' into tp4-roy

Conflicts:
	lua/forth
Merge branch 'tp4-roy' of github.com:sogiuser7/Forth into tp4-did

Conflicts:
	lua/forth
Fixed typo in cucumber tests (due to merge)