abc
Merge branch 'master' of https://github.com/renatorosseti/Match_up_franquias

Conflicts:
	MatchUpFranquias/src/com/example/franquias/franquia10_feed.java
	MatchUpFranquias/src/com/example/invest/invest05_meuPerfil.java
AAA