placeholder message
Merge pull request #2 from sempercapsicum/placeholder

placeholder message
fixed conflict, new fonts.