fixing source
updated index and social icon, twitter, new windows
fixed conflicts