update
post.html and main.html framework sorted out
fixed merge conficts