Merge branch 'master' of /Users/peter/Documents/kdg-sd/CarpoolApp with conflicts.
Successfully split up all controllers.
You're gonna love this commit :)