merged in kitchen app/ currently working on weather app
Merge branch 'parth'
weather test
update
widget added
update
weather
weather
weather
made the speaker look nice on every display
Merge branch 'master' into tom
added dafault location:'Chicago, IL'
commit
update
resolved conflicts
Merge branch 'master' into tom
Merge branch 'parthTest' into tom
resolved conflicts in webs.qml