Clase User version 1.0
Merge branch 'Leonel-User'
Merge branch 'master' of https://github.com/miguel502/SocialNetworkIS

Conflicts:
	app/models/User.php