50% chance of block
Merge branch 'master' of https://github.com/zetabeta/gamejam

Conflicts:
	core/src/main/java/com/gamejam/core/FieldBattle.java
Merge branch 'master' of https://github.com/zetabeta/gamejam

Conflicts:
	core/src/main/java/com/gamejam/core/FieldBattle.java