added event model, a bit of controller and view stuff
config merging fixed
Merge remote-tracking branch 'upstream/master'
added event tests
merged teams crud
Merge remote-tracking branch 'upstream/master' into dev
merged family model and tests
deleted typo events instead of event
Merge remote-tracking branch 'upstream/master' into dev
events CRUD works without team_id
finally got team_id to work on new and show pages
changed very little view details on events
show page now shows team name, not team id
Merge pull request #20 from AEgan/egan-dev

thanks, will see if it works on openshift now
fixing prod/dev db definition, will now function on openshift
finished roster spot MC but not V
Merge pull request #22 from duanw/master

looks good.  Except I don't get why you have getAllPlayers and getAllTeams as methods of RosterSpot. But it ain't hurtin nothing so I'll let it slide.
added a few tests
merging in rosterspots?
Merge pull request #21 from loganwatanabe/master

Merged #21