stuff
Revert "stuff"

This reverts commit f2760a4df79fcadde9c12e0eb8678c051f3b5a16.
Merge origin/master
Player 1 rendering complete