Added a fourth shape, added working buttons for pause screen, and fixed pause screen flashing.
Fix escape key not working
Fix restarting
Fix button location
Aligns buttons
Fixes alignment and sprites of buttons
Fix merge conflicts

I think this is right. And broken, mergetool was misbehaving.
Merge branch 'pause-menu'