merge
fix conflict
add image upload
fix merge confilicts
add new pic
Merge pull request #5 from oconn/users

Users