Enhanced Ace Logic

Woooooo!
*Resolved Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Game.java