Adding the articles part
Merge branch 'master' of https://github.com/ccphillip/COSC617_HealthyLife.git

Conflicts:
	config/routes.rb
	db/schema.rb