fixed conflicts.

updated content to reflect planning meeting prior to March 10. one activity and homework need to be updated.

Also added links to the class discussion and canvas to explain where
shared slide deck will be posted.