Finish 312-ABM-test-run
Finish 310-agregar-instrumentos
Conflicts:
	app/views/layouts/application.haml
ss
Finish 313-abm-agenda-test
Merge branch 'develop' of github.com:pgonzaga2012/orchestra into feature/314abmresultados

Conflicts:
	app/views/layouts/application.haml
Merge con develops