Show article page
Merge branch 'master' of https://github.com/sunniejai/black-sesame

Conflicts:
	Server/controllers/home.js
Merge branch 'master' of https://github.com/sunniejai/black-sesame