taking a new task
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO.md
adding shared secret option
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO.md