FINAL MASTER
Merge branch 'master' of github.com:eemihauk/ohtu2014