ג
Merge branch 'master' of https://github.com/beeriza/CarPal
ג
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml