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

Conflicts:
	Sekhavat/requirements.txt