Added main classes of project, only working build as CLI, however (Also has a few stub files to prevent compiler errors)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	PokeType.h
	Pokemon.h