more gui stuff
Merge branch 'master' of https://github.com/ultralaserdeluxe/gloria
Merge.
Merge branch 'mainthread_dev' of https://github.com/ultralaserdeluxe/gloria into mainthread_dev
Merge branch 'mainthread_dev' of https://github.com/ultralaserdeluxe/gloria into mainthread_dev
Added new is_on_straight function.