true
p
Merge branch 'master' of https://github.com/vjyanand/smarttrip

Conflicts:
	SmartTrip/AppDelegate.m
summ

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