2nd
work
before 1 layout
before 1 layout
before 1 layout
before 1 layout
Merge remote-tracking branch 'GitHub/master'

Conflicts:
	PhoNo.iws
	res/layout/activity_main.xml
1
Merge pull request #2 from Miamy/master1

Master1