modified 404& new post
Merge branch 'post'
noting post