style changes made to weather app
fix merge conflicts
merge Merge branch 'MarissaFelitto-master'