priyanka-worked with show pages layout
Merge branch 'master' of github.com:amzurtechnologies/ITKnowledgeTransfer

Conflicts:
	app/models/article.rb
	app/views/articles/_form.html.erb
	app/views/articles/index.html.erb
	app/views/articles/show.html.erb
	app/views/code_snippets/show.html.erb