added config
Merge remote-tracking branch 'tom/master' into ConsoleBranch
edit config file
shader blah
config edit werkt
merge tom/master