Merge pull request #2 from farahfouladi/master

updating lab 2
lab 2 is done and lab2main is added
Merge pull request #14 from lyeary/master

lab 2 is complete w/lab2main written