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

Conflicts:
	SmartPump/bin/classes/com/project/smartpump/CarInfoActivity.class