算是取得重大进展了吧

感觉现在已经做的非常帅了
Merge branch 'master' of https://github.com/Louis-Ye/ZheNarWeb

Conflicts:
	ZheNar/templates/profiles/register.html