Some work in midi stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/eu32k/neonshooter/core/ui/InGameScreen.java
Merge branch 'master' of
https://github.com/brookman/codenameNeonshooter.git

Conflicts:
	core/src/main/java/eu32k/neonshooter/core/ui/InGameScreen.java
merged