Alex test
Merge branch 'master' of https://github.com/jordankarisch/Team-Assignment-1

Conflicts:
	Pokedex/Pokedex/Pokedex/relation.cpp