Added profile pictures
Resolved conflicts. Added profile picture.