my blog
Merge branch 'master' of https://github.com/shtzr840329/blog

Conflicts:
	Gemfile
	Gemfile.lock
	bin/rails
	bin/rake
	config/application.rb
	config/database.yml
	config/environments/production.rb
	config/routes.rb
	config/secrets.yml