eighth step
Merge branch 'master' of https://github.com/ctscy/try_git.git

Conflicts:
	Sample/Sample/urls.py