fixed more merge issues
Merge pull request #29 from schreuderjo/post-deletion

fixed more merge issues
fixed the new post and edit post forms
Merge pull request #30 from schreuderjo/post-deletion

Post deletion