test konfliktu
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/biz/netdevelopers/aukceadrazby/MainActivity.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/biz/netdevelopers/aukceadrazby/MainActivity.java
test konfliktu