Faltou o npc na convenção

bwahaha
Merge branch 'master' of https://github.com/gabrielnaves/OAC_Final_2-2014