most of the way there with settings
Merge branch 'master' of https://github.com/allspain/fantasyfind

Conflicts:
	browser_action.html