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
added a few tests
adding emailtemp roster_spot
bootstrap
Merge pull request #23 from deliaz1993/master

Events CRD not U & Some Tests
adds more mailer functinos for notifications for adding players to teams
merges with upstream and fixes conflicts