Added article about cat cafe
Fixed catnews merge conflict