Added file to tracked branch
Merge branch 'haara2' of https://github.com/tuomoaalto/ohtu2013 into haara2