config is back
Merge branch 'master' of https://github.com/jopmesman/jframe

Conflicts:
	.gitignore