Griffin branch

Griffin Smith (gss092)requested to merge
GriffinBranch into development

fully working GUI, doesn't look the nicest yet, some labels and buttons are cut off

Merge request reports