Added from tracked branch haara2
Merge branch 'haara2' of github.com:ljleppan/ohtu2014 into haara2