trying to get article
Merge branch 'master' of https://github.com/arikalfus/Jeeves

Conflicts:
	public/js/mvc.js