added contacts page and fixed links
fixed conflicts