sqlite basic demo
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	runserver
	wsgi.py