Added some code for retrieving and displaying contacts
Resolved conflicts, fixed Settings
Resolved some conflicts.
Added Contacts link and implemented switching between the views