created with 'django-admin.py startproject hellodjango .'
mm
add .gitignore
readme
app.json
reorder settings around a bit
dummy static file
no app.json
single view
db page
Update README.md
firstcommit
secondcommit
Merge branch 'master' of https://github.com/qdw-luke/spawncamping-octo-bugfixes

Conflicts:
	.gitignore
	README.md

this is my merge