everything should be alright
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ru.ifmo.md.lesson3/MyActivity.java