Added Contact Page
Fixed Merge Conflicts