Created a fresh new Rails app
Merge branch 'master' of https://github.com/rcrivera/estimadolegislador

Conflicts:
	.gitignore