change contact.html
resolve conflict
addition complete
Merge branch 'A_team'