First commit from dedibox
Merge branch 'master' of github.com:Benarordure/blog-project

Conflicts:
	bin/bundle
	bin/rails
	bin/rake
	log/development.log