Finished TrafficDataController.m
Merging Xcode project files AGAIN
Mergin files some more
Merge branch 'master' of https://github.com/team-cocoa-pebbles/ios-app into traffic-info