add .gitignore
revised index.html, add about.html and resume.html
merged conflict