lab 3 almost done
Merge pull request #64 from lewenhagen/master

lab 3 almost done