changes
Merge branch 'master' of https://github.com/sheehamj13/mrs-cunningham

Conflicts:
	config.js
	content/data/ghost.db