Add Views To Articles
Merge branch 'master' of https://github.com/winfojenkins/winfo

Conflicts:
	app/controllers/articles_controller.rb
add views to articles