changed to bsd 3 clause because experimentation is fun, and none of this matters
Updated TODO
Merge remote-tracking branch 'origin'

Conflicts:
	TODO