add new viewController
Merge branch 'master' into alpha-1

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate
no message
Merge branch 'alpha-1'

Conflicts:
	Tripify.xcodeproj/project.xcworkspace/xcuserdata/macbookair.xcuserdatad/UserInterfaceState.xcuserstate