Add remove.
Merge remote-tracking branch 'origin/master'

Conflicts:
	funcs.sh
Add todo section.