merged Member.php
Merge branch 'master' of https://github.com/evilband7/sanak.prakad.git

Conflicts:
	application/Models/Entities/Member.php
Merge branch 'master' of https://github.com/evilband7/sanak.prakad.git

Conflicts:
	application/Models/Entities/Member.php
merged