lab 1 fixed and misc stuff we did today
Merge pull request #45 from lewenhagen/master

lab 1 fixed and misc stuff we did today