Here is my content to be merged

I have interwoven my discussion and exercises into the github repo itself, rather than use the wiki.  Let me know if we should move things around.