conflito
Merge branch 'master' of https://github.com/KasueFinato/forum-geografia
Merge branch 'master' of https://github.com/KasueFinato/forum-geografia
criado controller pra coment #75