Wasn't tracking showDB.config, apparently.
Merge branch 'master' of github.com:ddsnowboard/showDB

Conflicts:
	showDB.config
Trying to fix git issues...
Added showDB again.

Not really.