Merge branch 'master' of https://github.com/beeriza/CarPal

Conflicts:
	CarPal.iml
	src/com/BooYa/CarPal/MainActivity.java
Merge branch 'master' of https://github.com/beeriza/CarPal

Conflicts:
	CarPal.iml
	src/com/BooYa/CarPal/MainActivity.java
Merge remote-tracking branch 'origin/master'