windows db instructions
Merge branch 'master' into paul

Conflicts:
	search.json
Merge pull request #17 from ScriptRock/paul

windows db instructions
Merge branch 'master' into steve
clarified a point