added profile information
fixing shiz
fixed rebase conflicts
added photo and fixed profile page
fixed merge conflicts
added profile picture
fixed jenky profile view
added aimmes pic changes