vasl shode be ham
Merge branch 'master' of github.com:MohTaheri/MyAccount

Conflicts:
	MyAccount/urls.py
	MyMint/Cohort/models.py
	MyMint/Incometype/models.py
	khoms/__init__.py
	khoms/forms.py
	khoms/urls.py
	khoms/views.py
	templates/base.html
	templates/khoms/khoms.html