alaki!
Merge branch 'master' of https://github.com/Navid777/Badil

Conflicts:
	templates/base.html