Implemented "Masonry" plugin on news page
fixed merge conflict
fixed conflict on content-news.php