Hello from home
Merge branch 'master' of https://github.com/vov4yk86/djcode

Conflicts:
	mysite/views.py