Merge branch 'master' of https://github.com/gchamon/POO-TP2-Q2

Conflicts:
	Pentagonal.cpp
	Pentagonal.h
	Quadrados.cpp
	Quadrados.h
Merge branch 'master' of https://github.com/gchamon/POO-TP2-Q2
Merge branch 'master' of https://github.com/gchamon/POO-TP2-Q2