human interaction merge stuff v1
Merge branch 'master' of github.com:bachelor-2014/report