new change with sql
Merge branch 'master' of https://github.com/JGreenberger/ghosts

Conflicts:
	ghosts/index.wsgi