Change email address
Add Google Webmasters
Merge gitignore

Conflicts:
	.gitignore