merge conflicting GUI class
Merge remote-tracking branch 'origin/master'
building the foundation of Parser class