some text for the placeholders
Merge pull request #172 from tansaku/develop

some text for the placeholders