hw2 branch made + final assignment
Merge pull request #60 from frankchen07/hw2

hw2 branch made + lab assignment