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

Conflicts:
	main.cpp
Merge branch 'master' of github.com:jeukel/FSQL

Conflicts:
	main.cpp
Standarizing code.