resolved conflicts between two branches/commits (not sure of wording) so both the GUI functionality and the beginnings of the I/O are present in the main file