teste conflito
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/triangulum/com/guiaa/MainActivity.java