Mixing languages article
Merge branch 'master' of https://github.com/marcgg/marcgg.github.com

Conflicts:
	_site/atom.xml