Lili config
Merge pull request #48 from Parsnip/master

Lili config