gui display stuff
Merge branch 'master' of https://github.com/forrely/LoLScribe

Conflicts:
	apitest/apitest/match.h