Author Mane
change title
Merge branch 'master' of https://github.com/liana13/git
Author Mane
change title
Conflicts:
	registration/login.html
	registration/login.html~