Merge branch 'master' of github.com:pysecl1/pyblog1

Conflicts:
	.gitignore
Merge branch 'master' of github.com:pysecl1/pyblog1

Conflicts:
	.gitignore
Merge branch 'master' of github.com:pysecl1/pyblog1

Conflicts:
	.gitignore
static
models_settings