edit info fixed, add link
added company request
Merge branch 'master' of https://github.com/Soben713/shametara into HEAD

Conflicts:
	Sekhavat/mainapp/templates/login.html
Merge branch 'master' of https://github.com/Soben711/shametara into HEAD
hame chi engar ok e