Update viewArticles.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Update viewArticles.html, viewArticles.css