Added Post scaffold with title and content:text
Resolved first pull ignore conflict