updated
Merge branch 'master' of https://github.com/AlexGT/blog

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	Rakefile
	app/assets/stylesheets/application.css
	app/controllers/posts_controller.rb
	app/models/post.rb
	app/views/layouts/application.html.erb
	app/views/posts/edit.html.erb
	app/views/posts/index.html.erb
	app/views/posts/new.html.erb
	app/views/posts/show.html.erb
	app/views/welcome/index.html.erb
	config.ru
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb