god i hate when i change like 1 line and it makes me do this
Merge branch 'master' of https://github.com/Piefayth/GetErDone
Added non-ace ingame display code
Merge branch 'master' of https://github.com/Piefayth/GetErDone