Merge pull request #1 from cstipkovic/master

Merge com o projeto antigo em c++
Merge branch 'doolpiedex-lp1' of https://github.com/cstipkovic/Academic-Works into doolpiedex-lp1