detalles
Merge branch 'master' of https://github.com/pablo31/tadp

Conflicts:
	lib/prototyped_constructor.rb