edit bug
Merge branch 'master' of https://github.com/rainaz/buydo

Conflicts:
	application/models/user_model.php
edit typo
Fix typo
Merge branch 'master' of https://github.com/rainaz/buydo