added 2
Merge branch 'master' of github.com:mpiivonen/lopputyo