Link to english article
Merge branch 'master' of heroku.com:h3stogram

Conflicts:
	views/index.jade