[#3] Merge conflict properly resolved.
Merge branch 'feature/3_homepage' into feature/4_post_page