Merge branch 'master' of https://github.com/EgorLakomkin/hackaphone

Conflicts:
	templates/index.html