[MAJ] article 12
Merge branch 'master' of github.com:EpokK/epokk.github.io

Conflicts:
	articles/12.md