Merge pull request #8 from farahfouladi/master

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

merge
Merge pull request #9 from farahfouladi/master

merge
eviction test passing
Merge pull request #26 from lyeary/master

Merge pull request #9 from farahfouladi/master
Merge pull request #10 from farahfouladi/master

Merge pull request #26 from lyeary/master
evict test passing
Merge branch 'master' of https://github.com/lyeary/cosc460
to merge
to merge please
Merge pull request #29 from lyeary/master

mergggee