score screen ready, preparing for processing
test merge
Merge branch 'pong' of https://github.com/akohen/Merkurius-LD27 into pong
About to make the game start

And

Merge branch 'pong' of https://github.com/akohen/Merkurius-LD27 into pong

Conflicts:
	src/merkurius/ld27/pong/MainScreen.java