fix merge conflicts
hopefully fix terrible bugs that broke everything
fix merge conflicts
finally fix merge conflicts
Merge pull request #29 from FlappyMappy/UIFeatures

Hopefully fix that terrible error