Smoothed everything out and added more to the GUI
Merge branch 'master' of https://github.com/bandoncontortion/Rimor