Added GUI
Changes to gui
fixing conflicts
Merge branch 'anuradha1992-master'