articles
Merge branch 'master' of https://github.com/Kaifat/extrum

Conflicts:
	index.html