Merge branch 'master' of https://github.com/demid5111/walkyservice

Conflicts:
	.gitignore
	models.pyc
	urls.py
	urls.pyc
	views.pyc