Home page design displayed in /articles
Merge branch 'master' of github.com:ReturnToLife/Portal4

Conflicts:
	app/controllers/articles_controller.rb