Merge branch 'master' into 3-design-buttons-where-user-jumps-slides

.gitignore

.gitlab-ci.yml

android/build.gradle

android/src/tdt4240/netrunner/AndroidLauncher.kt

assets/bg_0.png

assets/bg_1.png

assets/bg_2.png

assets/char_blue_run.png

assets/char_blue_stand.png

assets/char_green_run.png

assets/char_green_stand.png

assets/char_red_run.png

assets/char_red_stand.png

assets/char_yellow_run.png

assets/char_yellow_stand.png

assets/default.fnt

assets/default.png

assets/powerup.png

assets/tile-platform-left.png

assets/tile-platform-mid.png