Confict Resolved
Merge branch 'master' of https://github.com/shashank0105/blog

Conflicts:
	app/assets/stylesheets/articles.css.scss
	app/controllers/yourviews_controller.rb
	app/views/yourviews/_form.html.erb
	app/views/yourviews/index.html.erb
	app/views/yourviews/index.json.jbuilder
	app/views/yourviews/show.html.erb
	app/views/yourviews/show.json.jbuilder
	config/secrets.yml
	db/schema.rb
	test/controllers/yourviews_controller_test.rb
	test/fixtures/yourviews.yml