Pridetas pirmas ir antras langas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/activity_my.xml
	app/src/main/res/layout/test_antras_antras.xml
prideta dar langas+drawables