primeiro
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
	app/build/generated/source/r/debug/br/com/asousajose/sunchime/R.java
	app/src/main/java/br/com/asousajose/sunchime/MyActivity.java
	app/src/main/res/layout/fragment_my.xml
	app/src/main/res/layout/list_item_forecast.xml
	build/intermediates/model_data.bin
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties
	local.properties
fragrmantes

adcao fragrmentes