push/pull test
Merge branch 'master' of https://github.com/knawrot/RobotsManagement

Conflicts:
	res/values/strings.xml
Twoja stara to fujara
Ja jebe co za gunwo
Diddy jest ogórem
Merge branch 'master' of https://github.com/knawrot/RobotsManagement

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/knawrot/RobotsManagement

Conflicts:
	res/values/strings.xml
Merge branch 'master' of https://github.com/knawrot/RobotsManagement
Ogórek
Parsowanie i renderowanie mapy w JSON
Scalable JSON map
Merge z Krzysiowymi wypocinami