function

edit
Merge branch 'master' of https://github.com/vontman/Social_Project

Conflicts:
	model/users.php