Ignored jpeg config
Merge branch 'master' of https://github.com/MartijnB/ETGoldy
Merge branch 'master' of https://github.com/MartijnB/ETGoldy