new design
commit
gem
sd
commit
commit
commit
cdfs
Merge branch 'master' into brigadir7717

Conflicts:
	app/assets/stylesheets/articles.css.scss
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.erb
	app/views/articles/edit.html.erb
	app/views/articles/index.html.erb
	app/views/articles/index.json.jbuilder
	app/views/articles/new.html.erb
	app/views/articles/show.html.erb
	app/views/articles/show.json.jbuilder
	db/schema.rb
	test/controllers/articles_controller_test.rb
	test/fixtures/articles.yml