fuelTruck and analysis modified"
Merge branch 'master' of https://github.com/rahulunair/cloudFinal
conflict fixed
Conflicts:
	analysis.py