Use config.def.h for own customizations
Merge branch 'master' of https://github.com/ekoeppen/st

Conflicts:
	config.h
Use config.def.h for own customizations