messed a bunch of stuff up. Let's see if I can at least undo the damage manually.
successfully back to where I started
Merge branch 'master' of github.com:Arepo/rockpaperscissors