Updated rest.php and user.php

rest.php mostly implement for what we need right now

Signed-off-by: thomasaj91 <thomasaj@uwm.edu>
Merge remote-tracking branch 'origin/master'