initializing git
worked on gui
added comments
Fixed merge conflicts