Your Name: Paul Gasbarra

Subject Line: Added show edit destroy actions to controller added article views for show, index, edi and new.

What Happened: See subject
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	app/controllers/article_controller.rb
	config/routes.rb
working with routes and controller differences