evaluation stuff
Merge branch 'master' of github.com:sebkur/swp12