added teams
update schedule
fixed merge conflict
Merge pull request #66 from fox-squirrels-2013/update_schedule

Update schedule