intial database built and tested
Merge branch 'master' of github.com:jwogrady/sprucepress

Conflicts:
	.gitignore