text added
Merge branch 'master' of https://github.com/sannakas/ohjelmistotuotanto_2014_rakenne