Adding new modules
conflitos
Merge pull request #6 from nunovieira220/develop

Develop