Reverted
Merge branch 'master' of https://github.com/elefse/JADITO
Merge branch 'master' of https://github.com/elefse/JADITO

Conflicts:
	src/BigButton.as
	src/PlayState.as
	src/ReplayScreen.as
	src/WinState.as