modified file `.gitignore`

	Conflict: .gitignore [local version]
modified file `favicon.gif`
modified file `favicon.ico`
modified file `quickstart.html`
modified file `wp-content`