marne dobrego początki
merge
merge2
naprawa konfliktów
Merge branch 'master' of https://github.com/Santanachia/RouteAdvisor

Conflicts:
	application/models/Dists.php