[Study] Blog app - class based templates
[Study] Image upload sample code - local host
Merge branch 'master' of https://github.com/alanleegithub/helloworld

Conflicts:
	HelloWorld/settings.py
	HelloWorld/urls.py
	blog/models.py
	blog/views.py
	db.sqlite3