todo update
Merge branch 'master' of github.com:dasmoth/dalliance

Conflicts:
	TODO.md
missing license
requests to commit

cbrowser.js, trackadder.js, twoBit.js