first version
Merge branch 'master' of github.com:homberghp/correctorsworkbench

Conflicts:
	.gitignore
Merge branch 'master' of github.com:homberghp/correctorsworkbench
all up?