zmenseni sloupce s rekordy
Merge remote-tracking branch 'origin/master'

Conflicts:
	mereniTeploty/src/app/Spustit.java
	mereniTeploty/src/model/HTTPClient.java
Merge branch 'master' of https://github.com/tuxmartin/meteotux

Conflicts:
	mereniTeploty/src/app/Spustit.java
	mereniTeploty/src/model/HTTPClient.java