javadoc added
Merge branch 'master' of github.com:teempitk/miniprojekti