forgot some files
Merge branch 'master' of github.com:maurish/Ohtu-miniprojekti