testing ok?
testing ok?
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/fragment_main.xml
Merge remote-tracking branch 'origin/master'
testing ok?