add 5678
Merge branch 'master' of https://github.com/KevinZhouZ/gittest

Conflicts:
	FuelPrice.m