user dashboard
Merge branch 'master' of https://github.com/niteshrepos/BarterX

Conflicts:
	app/controllers/articles.js