a
Merge branch 'master' of https://github.com/erks11/HackUOcha

Conflicts:
	app/src/main/res/layout/activity_my.xml