view_callout.feature added
merge conflicts
Merge branch 'master' of github.com:Richie166/RideshareOrganizer