Added some changes
Merge branch 'Ex5-Display-Fonts-2D' of https://github.com/BigBearGCU/GP2BaseCode into Ex5-Display-Fonts-2D

Conflicts:
	src/main.cpp