.
Merge branch 'master' of https://github.com/mangaldev/chalchitra

Conflicts:
	app/views/includes/foot.jade
	public/js/services/articles.js
merged