merging

added a basic GUI for the program