pt.yml
consertar conflito no logo Merge branch 'master' of https://github.com/jessicalau/vamosagir

Conflicts:
	app/assets/images/logo.png