add .gitnore
Merge branch 'master' of github.com:pbearne/wp-author-avatars

Conflicts:
	.gitignore