Worked on the gui
Merge branch 'master' of github.com:VashishtMadhavan/EE149FinalProject