Testing ...
Merge branch 'master' of github.com:jeukel/FSQL

Conflicts:
	konstants.h
	writefile.cpp