Merge pull request #1 from lyeary/master

ex4 part 1
Merge pull request #2 from lyeary/master

figuring out bs with git -- done with e4 p1
Merge pull request #3 from lyeary/master

yayyyy
finished ex4, in the middle of ex5
almost donr with ex/5
Merge pull request #1 from farahfouladi/master

updates from farah's repo - 9/12 @12pm