Comiteo rapido y sucio
Merge branch 'development' of https://github.com/xyiyox/modulo_seguimiento into development

Conflicts:
	implementacion/Gemfile
	implementacion/Gemfile.lock
	implementacion/Rakefile
	implementacion/coverage/.resultset.json
	implementacion/coverage/index.html
Se configura el CI