Merge branch 'master', remote-tracking branch 'origin'
Worked on tying all of the pieces together and added a game stats screen/activity. Right now the main thing that needs to be finished is the thread-driven bubble creation and movement in BubbleThread.
Fixed merge conflicts
Fixed merge conflicts
Finished fixing merge conflicts (I hope)
Fixed more merge conflicts.
This should be the last merge conflict commit. Should...