^_^
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	app/views/articles/index.html.erb
	app/views/layouts/application.html.erb
	app/views/users/update.html.erb