Don't think the previous android test folder was working, so I made a new one. Also minor changes to User. Added setter/getter for Choice.
a few small changes