Merge branch 'master' of C:\Users\user\RubymineProjects\TadpGrupo3 with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tp1Tadp/estategias.rb
	Tp1Tadp/framework.rb
	Tp1Tadp/main.rb
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	Tp1Tadp/trait.rb
Merge branch 'master' of https://github.com/kevin1992/TadpGrupo3
tests rspec