added profile page basics
fixed merge conflict in users_controller
picture functionality
fixed merge conflicts