Trip View - looks like shit right now
Merge branch 'master' of https://github.com/vjyanand/smarttrip

Conflicts:
	SmartTrip.xcodeproj/project.pbxproj
	SmartTrip/TripViewController.h
	SmartTrip/TripViewController.m
	SmartTrip/ViewController.m
something weird
merge
merge
Main Trip Page
merge