Merge pull request #14 from lyeary/master

lab 2 is complete w/lab2main written
filter is working
lab 3 finished
Merge pull request #3 from farahfouladi/master

lab 3 milestone pull