hovno
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/brnokavarna/melounovycukr/app/MainActivity.java
	app/src/main/res/layout/activity_main.xml
hovno