Rails new App
Merge branch 'master' of github.com:brunoocasali/elastic-rails-blog

Conflicts:
	.gitignore