Merge pull request #12 from kmekler/kirby

Kirby - edit and new styling