added bootstrap to macaya project and buttons 'volver'
Merge branch 'develop' of https://github.com/Jonakoelbl/eis-macaya1 into develop
Merge pull request #2 from Jonakoelbl/develop

Added bootstrap to macaya project and buttons 'volver'
Merge branch 'develop' of https://github.com/nahuelbe/eis-macaya1 into develop
	modified:   app/controllers/partidos.rb
	modified:   app/controllers/torneos.rb
	modified:   app/models/torneo.rb
	modified:   app/views/home/index.erb
	modified:   app/views/partidos/new.erb
	deleted:    app/views/torneos/edit.erb

	app/helpers/
	app/views/torneos/show.erb
	new file:   app/helpers/torneo_helper.rb
	new file:   app/views/torneos/show.erb