pridani tLACITKA A AKTIVITY MAREK UKOL 4
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/biz/netdevelopers/aukceadrazby/MainActivity.java
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/values/strings.xml
merge commit