changes
Merge branch 'master' of https://github.com/diy/satellite-pages
Drop markdown for marked