favorite stuff
Fixed merge issues
Merge pull request #32 from duskykmh/frontGUI

favorite stuff