Produto
Produto
Merge branch 'fernando_noronha' of
https://github.com/fapereira1/make-a-wish.git into fernando_noronha

Conflicts:
	src/main/java/com/ciandt/hackathon/dao/OfyService.java
	src/main/java/com/ciandt/hackathon/entity/Product.java
Gamification
Merge branch 'fernando_noronha' of
https://github.com/fapereira1/make-a-wish.git into fernando_noronha

Conflicts:
	src/main/java/com/ciandt/hackathon/config/GuiceServletConfig.java
Criando entidades
Criando entidades
entidades
Merge branch 'fernando_noronha' of
https://github.com/fapereira1/make-a-wish.git into fernando_noronha

Conflicts:
	src/main/java/com/ciandt/hackathon/config/GuiceServletConfig.java
Gamification