Backup - virtual machine looks like it might be burning up soon.
heres hoping this works
trying to resolve git problems.
Merge remote-tracking branch 'origin/master'

Conflicts:
	c/src/approximate.sh
	c/src/main.cpp
	c/src/semirings/lossy-semiring.h