started lab 2 (functions)
Merge pull request #40 from lewenhagen/master

started lab 2 (functions)