Rodrigo Carvalho Perpetuo
Merge branch 'master' of https://github.com/eduardo-bogoni-ifrj/ifrj-cvor-csti

Conflicts:
	Readme.md