REFORMATTED
Revert "REFORMATTED"

This reverts commit f0848d6374cb74e690c53d12363cda851ad45cd4.
Undoing formatting.
Merge remote-tracking branch 'origin/networking' into gui
Very quick commit
Allowing tickers to change the number of lines
Merge remote-tracking branch 'remotes/origin/gui' into networking
Merge didn't work?