I don't even know what I did.
Merge branch 'dev-main' of https://github.com/joezeng/fourstarmon into dev-main
Magic and more magic.
Merge branch 'dev-main' of https://github.com/joezeng/fourstarmon into dev-main
Added an "infobit" graphic to selecting Pokémon.
Merge branch 'dev-main' of https://github.com/joezeng/fourstarmon into dev-main

Conflicts:
	src/Application.cpp