jtn
Merge branch 'master' of github.com:ohtu2014-halme/ilmoprojekti
deleted .orig from controller
Merge branch 'master' of github.com:ohtu2014-halme/ilmoprojekti