Merge branch 'master' of https://github.com/vjyanand/travelometer

Conflicts:
	travel.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/vjyanand/travelometer

Conflicts:
	travel.xcodeproj/project.pbxproj