Added and edited templates (main, posts, post -.htmls)
Merge remote-tracking branch 'origin/master'