Logical changes
Merge branch 'master' of https://github.com/z3t4/Game

Conflicts:
	IIDXEmulator/Chart.h