Updated Controls, More Safe Commits

Finally updated control scheme. Last commit did not actually have the
updated control scheme. Its in this one. The controls use three buttons
(h, j, k) and combinations of these buttons allows you to hit five
circles. The radar circles are also color coded. I also fixed a couple
of issues with the 5th ring not working properly with the rhythm
circles.
This is the final safe commit. In this one I tried to get the engine
state and gamestate more separate, but I have found that I need to
really just create the arcade selector for the game. So I have decided
to do a safe commit, saving whatever is currently taking up the arcade
state. I will now begin to work on creating an arcade state where you
can select from a variety of songs. This will help me rework the game
engine to work properly, while also giving us a functioning arcade
system.