bug fix
Merge branch 'master' of github.com:delsener/ch.zhaw.softwareprj2