Update TODO.
Merge branch 'new-ui' of github.com:jwintersinger/kablammo into new-ui

Conflicts:
	TODO