Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Updates weather with colors per weather type, removes add city input from non-logged in pages
Adds fade in animation for new clocks
Fixes merge conflicts
Merge pull request #29 from ambertunnell/ben_2

Ben 2