fix style
Merge branch 'master' of https://github.com/mwong56/Vencedor

Conflicts:
	src/com/mwong56/vencedor/MainGamePanel.java