slightly prettier makefile
Very basic calibrator
Merge branch 'master' of github.com:bachelor-2014/code