added associations
Merge branch 'master' of https://github.com/nahuelbe/eis-macaya1

Conflicts:
	app/models/torneo.rb