test
database
Merge branch 'master' of github.com:Pacane/blog

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/posts/news.html.erb
	config/deploy.rb
	vendor/bundle/ruby/2.1.0/gems/rack-1.5.2/test/multipart/bad_robots