took back out printfs
Merge branch 'shaina' of github.com:/nsat/libcsp into shaina