trying to sync
Merge branch 'master' of https://github.com/networkninjadh/3380-GAS-App

Conflicts:
	SmartPump/bin/classes/com/project/smartpump/CarInfoActivity.class
	SmartPump/bin/classes/com/project/smartpump/MainActivity.class
	SmartPump/bin/classes/com/project/smartpump/MapView.class
	SmartPump/bin/classes/com/project/smartpump/R$id.class
	SmartPump/bin/classes/com/project/smartpump/R$integer.class
	SmartPump/bin/classes/com/project/smartpump/R$layout.class
	SmartPump/bin/classes/com/project/smartpump/R$menu.class
	SmartPump/bin/classes/com/project/smartpump/R$string.class
	SmartPump/bin/classes/com/project/smartpump/R$style.class
	SmartPump/bin/classes/com/project/smartpump/R$styleable.class