whodata
Merge branch 'master' of https://github.com/johnyerhot/tinydocit

Conflicts:
	Capfile