Small
Merge branch 'master' of https://github.com/Jakub-Ciecierski/android

Conflicts:
	android_game/app/src/main/java/com/example/mini/game/GameRenderer.java
	android_game/app/src/main/java/com/example/mini/game/audio/AudioPlayer.java
Commit