Merge branch 'master' of https://github.com/Ja-ake/stickfighter.git