vai commit
vai commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	beerV1/src/com/example/model/BeerExpert.java
	
	comita porra