main.xml changed
main.xml changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/main.xml
main.xml changed