Made changes
Added profile pics from facebook
Merge conflict
resolved merge conflicts