comit
Merge branch 'master' of https://github.com/sumitbajracharya/blooddonation

Conflicts:
	blooddonation/User/User.master