Article
Merge branch 'formatting'

Conflicts:
	main.css