Merge pull request #11 from paultgibbons/master

add option for mark to get json
Merge pull request #12 from paultgibbons/master

fix json response object
fix rec
Merge pull request #13 from paultgibbons/master

add api for android app
Merge branch 'master' of https://github.com/cjameszhang/cs411
Give users ability to change their name or profile image
Add handling for multiple users with same name