mytag broken
Merge branch 'master' of https://github.com/SouthsideHuskie/newstracker

Conflicts:
	app/controllers/articles_controller.rb
	config/routes.rb