Added another persons contact to users contact
Made UI look better
Resolved merge conflicts
Added Amandas icon art assets