Add database changes
Merge branch 'master' of github.com:madyondza/blog
Move ghost folder contents into root blog folder

Conflicts:
	content/data/ghost-dev.db