Messy code
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/ascendance/entities/Kayalin.java