-Modificado "feed" por "fid" en "Users"

Signed-off-by: unknown <elopez2@ellopezarvlz02.latam.americas.gcn.local>
Merge branch 'master' of git@github.com:martin-sanjuan/trivia.git
-Agregada la propiedad "test2" en "Users"

Signed-off-by: unknown <elopez2@ellopezarvlz02.latam.americas.gcn.local>
Merge branch 'master' of git@github.com:martin-sanjuan/trivia.git

Conflicts:
	class/user.php

Signed-off-by: unknown <elopez2@ellopezarvlz02.latam.americas.gcn.local>