dont need timestamps
Merge branch 'master' of github.com:jorisbontje/cll-sim