cambios user.php
Merge branch 'master' of github.com:OOTTEE/skewers

Conflicts:
	model/User.php
cambio index.php