SHIT
Merge branch 'master' of https://github.com/Soben713/shametara

Conflicts:
	Sekhavat/managers/templates/managers/shamtara/menu.html
SHIT