some carpool stuff
player merge
event edit fixed
carpool model up, as well as a nicely formatted test file (check it out)
crud functionality in for carpools
Merge pull request #45 from loganwatanabe/master

Carpools