lab 2 done, need cleanup
Merge pull request #41 from lewenhagen/master

lab 2 done, need cleanup