app #1 - confirmed weather widget
fix merge conflict
Merge branch 'kevinnathanael-master'