haara2.txt edit
Merge branch 'haara2' of github.com:eemihauk/ohtu2014 into haara2clone