Merge branch 'feature-lives' into develop
Merge branch 'develop' into code-cleanup
Clean up update and Fighter.java
Merge branch 'code-cleanup' into develop
For some reason this bullshit is fucked
Merge branch 'develop' into feature-lives