added ignore
Merge branch 'master' of https://github.com/shrig94/pokemon

Conflicts:
	.gitignore
	client/.DS_Store