Merge branch 'master' of https://github.com/heekzz/Lab1

Conflicts:
app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/heekzz/Lab1

Conflicts:
	app/src/main/res/layout/activity_main.xml
TEST100012