Merge pull request #12 from khempenius/mergePencilIcon

Merged pencil icon
Fixed merge request in template.jade