Primer commit
Merge https://github.com/jdaniel14/disc_leguyane