cleaned up lab 2 and removed the unneeded functions
Merge pull request #44 from lewenhagen/master

cleaned up lab 2 and removed the unneeded functions