Merge pull request #44 from duanw/master

Fixed players show page
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
adds rider model
adds rider_tests, trying to get around this issue here
adds more rider tests for that test driven development
tests the getters for the fks
adds getBy_____Id tests for rider test
adds getbyids test
moves rider stuff to carpool to get tests to work to get around dependency issues for now
fixed a bug in the time format function
added the next_event function to the team roster on the team show page
added dropdowns to event, and fixed the edit page
Merge pull request #46 from loganwatanabe/master

Event Date/Time bugs and Team_show
get by ids works, and is tested, which is nice
Merge branch 'master' into egan-dev
adding rider stuff to upstream's master