ok
Merge branch 'master' of https://github.com/larusx/center

Conflicts:
	myapp/templates/a.html