gausstest
Merge branch 'text_display' of github.com:seba-1511/meritocracy into text_display