Merge pull request #8 from farahfouladi/master

m
woot
writeups for lab5
Merge pull request #25 from lyeary/master

merge