whoops, code from old version has been merged
Merge branch 'master' of github.com:bachelor-2014/code