Resolução de comflitos
Merge branch 'master' of https://github.com/luisneiva/CMU