Jolteon
Merge branch 'master' of https://github.com/AwestruckStudios/Gen6

Conflicts:
	pokemon.poke