getting there
working on it
Merge branch 'article_full'

Conflicts:
	app/article.html
	app/develop/d_index.html
	app/index.html
	dist/index.html
	dist/scripts/main.js
	dist/styles/main.css
...