changing twitter and adding contact page
merge conflicts