clearing
Merge pull request #134 from michalbe/flatfish-template-temp

clearing