commit all changes
Merge branch 'master' of github.com:ndjurabe/ohtu-viikko1-2014