gui integration
resolved conflicts
Merge pull request #2 from anuradha1992/master

Gui integration