Updated amethyst logo
.
Merge branch 'master' of https://github.com/jd4564/Pokemon-Showdown-Client

Conflicts:
	.gitignore