Preparing heroku.
Testing heroku
Testing heroku
Merge branch 'master' of heroku.com:parlamento

Conflicts:
	parlamentoapi.rb
Elimina archivos no usados y actualiza readme.
Merge branch 'master' of github.com:uruguay-pais/api-parlamento into for_deployment

Conflicts:
	Gemfile.lock
Merge branch 'for_deployment' of github.com:uruguay-pais/api-parlamento into for_deployment

Conflicts:
	Dockerfile