haara2
Merge branch 'haara2' of github.com:joentaus/ohtu2014 into haara2