Merge branch 'simpsons' of https://github.com/eneuhauss/coinfictchars
Merge remote-tracking branch 'origin/master'